ffmpeg/tests/ref/lavf/mxf_d10

33a6527a6907ec185258970d04254ee4 *./tests/data/lavf/lavf.mxf_d10
5330989 ./tests/data/lavf/lavf.mxf_d10
./tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488
Merge commit '8a06794112d02a5707f766b8b38a5d50dfd03898' * commit '8a06794112d02a5707f766b8b38a5d50dfd03898': mpeg2: add sequence display extension information Conflicts: libavcodec/mpeg12enc.c tests/ref/lavf/gxf tests/ref/lavf/mxf tests/ref/lavf/mxf_d10 tests/ref/lavf/ts tests/ref/seek/lavf-gxf tests/ref/seek/lavf-mxf tests/ref/seek/lavf-ts tests/ref/seek/vsynth2-mpeg2-422 tests/ref/seek/vsynth2-mpeg2-idct-int tests/ref/seek/vsynth2-mpeg2-ilace tests/ref/seek/vsynth2-mpeg2-ivlc-qprd tests/ref/seek/vsynth2-mpeg2-thread tests/ref/seek/vsynth2-mpeg2-thread-ivlc tests/ref/vsynth/vsynth1-mpeg2 tests/ref/vsynth/vsynth1-mpeg2-422 tests/ref/vsynth/vsynth1-mpeg2-idct-int tests/ref/vsynth/vsynth1-mpeg2-ilace tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd tests/ref/vsynth/vsynth1-mpeg2-thread tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc tests/ref/vsynth/vsynth2-mpeg2 tests/ref/vsynth/vsynth2-mpeg2-422 tests/ref/vsynth/vsynth2-mpeg2-idct-int tests/ref/vsynth/vsynth2-mpeg2-ilace tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd tests/ref/vsynth/vsynth2-mpeg2-thread tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc Merged-by: Michael Niedermayer <michaelni@gmx.at> 2014-06-06 22:36:07 +02:00			`33a6527a6907ec185258970d04254ee4 *./tests/data/lavf/lavf.mxf_d10`
fate: separate lavf-mxf_d10 test from lavf-mxf Signed-off-by: Mans Rullgard <mans@mansr.com> 2011-07-17 16:40:05 +02:00			`5330989 ./tests/data/lavf/lavf.mxf_d10`
mpegvideo_enc: reduce QMAT_SHIFT to avoid overflow in dnxhd Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 2012-09-20 22:29:03 +02:00			`./tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488`