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
fate	Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2'	2015-06-22 23:34:56 +02:00
lavf
lavf-fate
seek
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