Michael Niedermayer db23d5de27 Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0' ... * commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0': wmv2: move IDCT to its own DSP context. Conflicts: libavcodec/dsputil.h tests/ref/seek/vsynth2-wmv2 tests/ref/vsynth/vsynth1-wmv2 tests/ref/vsynth/vsynth2-wmv2 Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-01-21 16:07:21 +01:00
..
acodec-adpcm-ima_qt	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-adpcm-ima_wav	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-adpcm-ms	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-adpcm-swf	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-adpcm-yamaha	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-alac	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-flac	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
acodec-mp2	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-pcm-alaw	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-pcm-f32be	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
acodec-pcm-f32le	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-pcm-f64be	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
acodec-pcm-f64le	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-pcm-mulaw	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-pcm-s8	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-pcm-s16be	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-pcm-s16le	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-pcm-s24be	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-pcm-s24le	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-pcm-s32be	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-pcm-s32le	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
acodec-pcm-u8	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
lavf-aiff	fate: update seek-lavf-aiff after previous commit	2013-01-03 20:03:43 +00:00
lavf-alaw	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
lavf-asf	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-au	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-avi	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-bmp	fate: upate after 55d32eed8f	2013-01-08 18:47:09 +00:00
lavf-dv_fmt	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-ffm	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-flv_fmt	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-gif	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-gxf	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-jpg	fate: upate after 55d32eed8f	2013-01-08 18:47:09 +00:00
lavf-mkv	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-mmf	10l: Update fate seeking reference after last commit.	2013-01-05 23:42:00 +01:00
lavf-mov	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-mpg	mpegpsenc: avoid shifting dts/pts	2013-01-04 20:58:59 +01:00
lavf-mulaw	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
lavf-mxf	mxfdec: Rescale audio stream duration from EditRate to SampleRate	2012-12-25 17:45:34 +01:00
lavf-mxf_d10	mxfdec: Rescale audio stream duration from EditRate to SampleRate	2012-12-25 17:45:34 +01:00
lavf-nut	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-ogg	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-pbmpipe	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
lavf-pcx	fate: upate after 55d32eed8f	2013-01-08 18:47:09 +00:00
lavf-pgm	fate: upate after 55d32eed8f	2013-01-08 18:47:09 +00:00
lavf-pgmpipe	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
lavf-ppm	fate: upate after 55d32eed8f	2013-01-08 18:47:09 +00:00
lavf-ppmpipe	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
lavf-rm	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-sgi	fate: upate after 55d32eed8f	2013-01-08 18:47:09 +00:00
lavf-swf	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
lavf-tga	fate: upate after 55d32eed8f	2013-01-08 18:47:09 +00:00
lavf-tiff	fate: upate after 55d32eed8f	2013-01-08 18:47:09 +00:00
lavf-ts	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-voc	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-wav	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
lavf-wtv	fate: fix typos in wtv seek test	2012-12-03 03:15:41 +01:00
lavf-yuv4mpeg	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
vsynth2-asv1	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
vsynth2-asv2	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
vsynth2-dnxhd-720p	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-dnxhd-720p-rd	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-dnxhd-1080i	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-dv	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-dv-50	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-dv-411	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-ffv1	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
vsynth2-flashsv	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
vsynth2-flv	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-h261	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-h263	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-h263p	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-huffyuv	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
vsynth2-jpegls	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
vsynth2-ljpeg	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
vsynth2-mjpeg	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg1	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg1b	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg2-422	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg2-idct-int	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg2-ilace	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg2-ivlc-qprd	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg2-thread	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg2-thread-ivlc	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg4	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg4-adap	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg4-adv	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
vsynth2-mpeg4-error	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg4-nr	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg4-qpel	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg4-qprd	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg4-rc	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-mpeg4-thread	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-msmpeg4	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-msmpeg4v2	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-rgb	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
vsynth2-roqvideo	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00
vsynth2-rv10	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-rv20	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-snow	Drop Snow codec	2013-01-06 16:30:02 +01:00
vsynth2-snow-ll	Drop Snow codec	2013-01-06 16:30:02 +01:00
vsynth2-svq1	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-wmv1	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'	2012-12-03 02:33:27 +01:00
vsynth2-wmv2	Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'	2013-01-21 16:07:21 +01:00
vsynth2-yuv	fate: split dependencies for fate-seek tests	2012-12-02 23:25:41 +01:00