Michael Niedermayer ff68b83968 Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2' ... * commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2': DirectDraw Surface image decoder Conflicts: Changelog configure doc/general.texi libavcodec/Makefile libavcodec/version.h tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2015-06-22 23:34:56 +02:00
..
acodec	avformat/rawenc: Store sample number for ADX	2015-06-21 12:16:24 +02:00
fate	Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2'	2015-06-22 23:34:56 +02:00
lavf	lavf/riffenc: Set correct block align for mp2.	2015-06-04 17:03:34 +02:00
lavf-fate	Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'	2014-10-24 15:30:12 +02:00
seek	avformat/mxfenc: Add color siting element	2015-05-22 15:30:31 +02:00
vsynth	fate: add some tests for ffv1 level 3 with 8/10/16 bps	2015-06-22 19:09:50 +02:00
vsynth1	…
vsynth_lena	tests: Rename vsynth2 to vsynth_lena	2014-12-02 03:02:30 +01:00