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/vsynth/vsynth1-mpeg2-ilace | |
| 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/vsynth/vsynth1-mpeg2-ilace')
| -rw-r--r-- | tests/ref/vsynth/vsynth1-mpeg2-ilace | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/vsynth/vsynth1-mpeg2-ilace b/tests/ref/vsynth/vsynth1-mpeg2-ilace index b9144b67a2..935d0a02f6 100644 --- a/tests/ref/vsynth/vsynth1-mpeg2-ilace +++ b/tests/ref/vsynth/vsynth1-mpeg2-ilace @@ -1,4 +1,4 @@ -a92e79aa97a2d6b3b48b6cd9ceee1701 *tests/data/fate/vsynth1-mpeg2-ilace.mpeg2video -738127 tests/data/fate/vsynth1-mpeg2-ilace.mpeg2video +fd9bab29dded06c20564b6ae04117e6c *tests/data/fate/vsynth1-mpeg2-ilace.mpeg2video +738187 tests/data/fate/vsynth1-mpeg2-ilace.mpeg2video d0f2fab8d3a3fb8bc67aca068447d2db *tests/data/fate/vsynth1-mpeg2-ilace.out.rawvideo stddev: 7.67 PSNR: 30.43 MAXDIFF: 84 bytes: 7603200/ 7603200 |