mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-21 14:26:59 +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
315a5ae0cea0fa35ae98dbd827b1270c *./tests/data/lavf/lavf.gxf
|
|
795912 ./tests/data/lavf/lavf.gxf
|
|
./tests/data/lavf/lavf.gxf CRC=0xda7cebbc
|
|
11c6b8f1792fff5b332ee660c1ccc0c0 *./tests/data/lavf/lavf.gxf
|
|
794692 ./tests/data/lavf/lavf.gxf
|
|
./tests/data/lavf/lavf.gxf CRC=0x7f0c9089
|
|
93381d4fdda7297c8f0ca98b2d21e779 *./tests/data/lavf/lavf.gxf
|
|
795912 ./tests/data/lavf/lavf.gxf
|
|
./tests/data/lavf/lavf.gxf CRC=0x5ade0285
|