diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 22:36:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 22:36:07 +0200 |
| commit | 5163fb9446f38eed7b950f285954bb8d3bde3899 (patch) | |
| tree | a18369c55b4da7425bfbbeadac0b2c474e499600 /tests/ref/lavf/gxf | |
| parent | 7eb5b20a87c1b786759de6b61cd6655edbb3e320 (diff) | |
| parent | 8a06794112d02a5707f766b8b38a5d50dfd03898 (diff) | |
| download | ffmpeg-5163fb9446f38eed7b950f285954bb8d3bde3899.tar.gz | |
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>
Diffstat (limited to 'tests/ref/lavf/gxf')
| -rw-r--r-- | tests/ref/lavf/gxf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf index d356f20811..a19d26d8e3 100644 --- a/tests/ref/lavf/gxf +++ b/tests/ref/lavf/gxf @@ -1,9 +1,9 @@ -7993da95d8bfe04832e27892c163e562 *./tests/data/lavf/lavf.gxf -795876 ./tests/data/lavf/lavf.gxf +315a5ae0cea0fa35ae98dbd827b1270c *./tests/data/lavf/lavf.gxf +795912 ./tests/data/lavf/lavf.gxf ./tests/data/lavf/lavf.gxf CRC=0xda7cebbc -9e873074b5c3ef1d80d233a38e7de156 *./tests/data/lavf/lavf.gxf -794656 ./tests/data/lavf/lavf.gxf +11c6b8f1792fff5b332ee660c1ccc0c0 *./tests/data/lavf/lavf.gxf +794692 ./tests/data/lavf/lavf.gxf ./tests/data/lavf/lavf.gxf CRC=0x7f0c9089 -0638c4d073ac224608baaba16732b68f *./tests/data/lavf/lavf.gxf -795876 ./tests/data/lavf/lavf.gxf +93381d4fdda7297c8f0ca98b2d21e779 *./tests/data/lavf/lavf.gxf +795912 ./tests/data/lavf/lavf.gxf ./tests/data/lavf/lavf.gxf CRC=0x5ade0285 |