Michael Niedermayer a5b2b22d9a Merge commit 'c0b105756f' ... * commit 'c0b105756f': txd: Use the TextureDSP module for decoding Conflicts: configure libavcodec/s3tc.c libavcodec/s3tc.h libavcodec/txd.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2015-06-22 21:15:50 +02:00
..
acodec	avformat/rawenc: Store sample number for ADX	2015-06-21 12:16:24 +02:00
fate	Merge commit 'c0b105756f'	2015-06-22 21:15:50 +02:00
lavf	lavf/riffenc: Set correct block align for mp2.	2015-06-04 17:03:34 +02:00
lavf-fate	Merge commit 'ef363ebd59'	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