virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity
5163fb9446
FFmpeg/tests/ref/lavf/gxf

10 lines
411 B
Plaintext
Raw Normal View History

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 23:36:07 +03:00
315a5ae0cea0fa35ae98dbd827b1270c *./tests/data/lavf/lavf.gxf
795912 ./tests/data/lavf/lavf.gxf
ffmpeg: remove obsolete workaround in trim insertion. The bug it was working seems to have been fixed. This change causes ffmpeg to use the trim filter to implement the -t option. FATE tests are updated due to the more accurate handling of the last packets.
2013-08-07 15:46:07 +03:00
./tests/data/lavf/lavf.gxf CRC=0xda7cebbc
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 23:36:07 +03:00
11c6b8f1792fff5b332ee660c1ccc0c0 *./tests/data/lavf/lavf.gxf
794692 ./tests/data/lavf/lavf.gxf
ffmpeg: remove obsolete workaround in trim insertion. The bug it was working seems to have been fixed. This change causes ffmpeg to use the trim filter to implement the -t option. FATE tests are updated due to the more accurate handling of the last packets.
2013-08-07 15:46:07 +03:00
./tests/data/lavf/lavf.gxf CRC=0x7f0c9089
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 23:36:07 +03:00
93381d4fdda7297c8f0ca98b2d21e779 *./tests/data/lavf/lavf.gxf
795912 ./tests/data/lavf/lavf.gxf
ffmpeg: remove obsolete workaround in trim insertion. The bug it was working seems to have been fixed. This change causes ffmpeg to use the trim filter to implement the -t option. FATE tests are updated due to the more accurate handling of the last packets.
2013-08-07 15:46:07 +03:00
./tests/data/lavf/lavf.gxf CRC=0x5ade0285
Reference in New Issue Copy Permalink