Michael Niedermayer 28eacd1351 Merge commit '58a868968df445068a143f327ced03b6a02baf0d' ...

* commit '58a868968df445068a143f327ced03b6a02baf0d':
  FATE: drop the last partial frame in the wmv8-drm test

Conflicts:
	tests/ref/fate/wmv8-drm

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-12-06 04:03:05 +01:00

..

acodec

avcodec: split mp2 encoder into float and fixed

2013-12-03 21:12:00 +01:00

fate

Merge commit '58a868968df445068a143f327ced03b6a02baf0d'

2013-12-06 04:03:05 +01:00

lavf

…

lavf-fate

…

seek

avformat/utils: inject audio skip side data before the side data merge code

2013-11-21 03:21:23 +01:00

vsynth

…

vsynth1

…

vsynth2

…