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/vsynth2-mpeg2-422 | |
| parent | 7eb5b20a87c1b786759de6b61cd6655edbb3e320 (diff) | |
| parent | 8a06794112d02a5707f766b8b38a5d50dfd03898 (diff) | |
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/vsynth2-mpeg2-422')
| -rw-r--r-- | tests/ref/vsynth/vsynth2-mpeg2-422 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ref/vsynth/vsynth2-mpeg2-422 b/tests/ref/vsynth/vsynth2-mpeg2-422 index b4a896c5c9..9dc7b9da64 100644 --- a/tests/ref/vsynth/vsynth2-mpeg2-422 +++ b/tests/ref/vsynth/vsynth2-mpeg2-422 @@ -1,4 +1,4 @@ -521ec92c0b8672011a43dd13db98c400 *tests/data/fate/vsynth2-mpeg2-422.mpeg2video -356431 tests/data/fate/vsynth2-mpeg2-422.mpeg2video -51ca353620f85db8b5b1c56f1a275add *tests/data/fate/vsynth2-mpeg2-422.out.rawvideo -stddev: 3.15 PSNR: 38.14 MAXDIFF: 49 bytes: 7603200/ 7603200 +6e729f009dcb0acc7a819318fc4745b3 *tests/data/fate/vsynth2-mpeg2-422.mpeg2video +356208 tests/data/fate/vsynth2-mpeg2-422.mpeg2video +c5872e5d40b1f89f8c7be1befaede07c *tests/data/fate/vsynth2-mpeg2-422.out.rawvideo +stddev: 3.16 PSNR: 38.13 MAXDIFF: 49 bytes: 7603200/ 7603200 |