mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-30 02:00:46 +00:00
5163fb9446
* 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>
10 lines
411 B
Plaintext
10 lines
411 B
Plaintext
843cb0b346af5d7a240e926a9974f421 *./tests/data/lavf/lavf.mxf
|
|
525369 ./tests/data/lavf/lavf.mxf
|
|
./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1
|
|
2d7e42e0fec6727184adf59aedc270f5 *./tests/data/lavf/lavf.mxf
|
|
560697 ./tests/data/lavf/lavf.mxf
|
|
./tests/data/lavf/lavf.mxf CRC=0x3ff4178e
|
|
4f499ff1f4f8514e2ed6c3a3c31ed53d *./tests/data/lavf/lavf.mxf
|
|
525369 ./tests/data/lavf/lavf.mxf
|
|
./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1
|