diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-16 22:29:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-16 22:32:05 +0200 |
| commit | 703e920bb75053bf6b87d41d198cbbfbce3fb7ad (patch) | |
| tree | 97b86b3ae104e48e6098fc0c1c243e096e4cdd32 /tests/ref/vsynth1 | |
| parent | 4d3787763218de4c3e838b31f0fb2153b8d6af20 (diff) | |
| parent | 6ce51a9b392aaf647c4cdfd149fff1af5259a6fd (diff) | |
| download | ffmpeg-703e920bb75053bf6b87d41d198cbbfbce3fb7ad.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Work around non-standard wc implementations at more places
fate: work around non-standard wc implementations
x86: rv40: Mark rv40_weight functions as MMX2; they use MMX2 instructions.
ac3dsp: simplify x86 versions of ac3_max_msb_abs_int16
fate: use standard diff options
tta: Fix comment about channel number; TTA supports >2 channels.
avfilter: Move ff_get_ref_perms_string() to where it is used.
build: Add 'check' target to run all compile and test targets.
indeo3: validate new frame size before resetting decoder
indeo3: when freeing buffers, set pointers referencing them to NULL as well
indeo3: initialise pixel planes on allocation
indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder
fate: rename psx-str-v3-mdec to mdec-v3
fate: convert psx-str to a demuxer test
lavf: add mdec to is_intra_only() list
Conflicts:
doc/developer.texi
libavcodec/indeo3.c
libavfilter/video.c
libavformat/utils.c
tests/fate/demux.mak
tests/fate/video.mak
tests/lavf-regression.sh
tests/ref/vsynth1/cljr
tests/ref/vsynth1/ffvhuff
tests/ref/vsynth2/cljr
tests/ref/vsynth2/ffvhuff
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth1')
| -rw-r--r-- | tests/ref/vsynth1/cljr | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth1/dnxhd_720p_10bit | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth1/ffvhuff | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth1/r210 | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth1/v308 | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth1/y41p | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth1/yuv4 | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/tests/ref/vsynth1/cljr b/tests/ref/vsynth1/cljr index 73dc6ba578..6002bbbbb6 100644 --- a/tests/ref/vsynth1/cljr +++ b/tests/ref/vsynth1/cljr @@ -1,4 +1,4 @@ 041982e4fa83428c621a127647d47b3f *./tests/data/vsynth1/cljr.avi - 5075660 ./tests/data/vsynth1/cljr.avi +5075660 ./tests/data/vsynth1/cljr.avi e1c4c96c74de3435d0f9f6118c5ed9b5 *./tests/data/cljr.vsynth1.out.yuv stddev: 30.53 PSNR: 18.43 MAXDIFF: 225 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/dnxhd_720p_10bit b/tests/ref/vsynth1/dnxhd_720p_10bit index ad97b66b7d..499714c80b 100644 --- a/tests/ref/vsynth1/dnxhd_720p_10bit +++ b/tests/ref/vsynth1/dnxhd_720p_10bit @@ -1,4 +1,4 @@ b5e24a055af02edec8674333260214fd *./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd - 2293760 ./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd +2293760 ./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd 4466ff3d73d01bbe75ea25001d379b63 *./tests/data/dnxhd_720p_10bit.vsynth1.out.yuv stddev: 6.27 PSNR: 32.18 MAXDIFF: 64 bytes: 760320/ 7603200 diff --git a/tests/ref/vsynth1/ffvhuff b/tests/ref/vsynth1/ffvhuff index c6d7627b24..aa45211706 100644 --- a/tests/ref/vsynth1/ffvhuff +++ b/tests/ref/vsynth1/ffvhuff @@ -1,4 +1,4 @@ 0632ffae6f1e06dd299bf41a845b9099 *./tests/data/vsynth1/ffvhuff.avi - 5987208 ./tests/data/vsynth1/ffvhuff.avi +5987208 ./tests/data/vsynth1/ffvhuff.avi c5ccac874dbf808e9088bc3107860042 *./tests/data/ffvhuff.vsynth1.out.yuv stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/r210 b/tests/ref/vsynth1/r210 index 9d5e37c7ff..3d561ad71e 100644 --- a/tests/ref/vsynth1/r210 +++ b/tests/ref/vsynth1/r210 @@ -1,4 +1,4 @@ 604a34c9f9151891c2d63d2652b75329 *./tests/data/vsynth1/r210.avi - 22125260 ./tests/data/vsynth1/r210.avi +22125260 ./tests/data/vsynth1/r210.avi ecaafa9eec11b5e1453a63ed6d194eed *./tests/data/r210.vsynth1.out.yuv stddev: 3.23 PSNR: 37.94 MAXDIFF: 48 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/v308 b/tests/ref/vsynth1/v308 index 873d52a5f0..4f293b8917 100644 --- a/tests/ref/vsynth1/v308 +++ b/tests/ref/vsynth1/v308 @@ -1,4 +1,4 @@ 8d5f2065ce6547acc51041a679b7d6c4 *./tests/data/vsynth1/v308.avi - 15213260 ./tests/data/vsynth1/v308.avi +15213260 ./tests/data/vsynth1/v308.avi 10fb42f1abf40a289c3edafc0390482c *./tests/data/v308.vsynth1.out.yuv stddev: 2.67 PSNR: 39.60 MAXDIFF: 43 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/y41p b/tests/ref/vsynth1/y41p index 36f45f1a34..3039813499 100644 --- a/tests/ref/vsynth1/y41p +++ b/tests/ref/vsynth1/y41p @@ -1,4 +1,4 @@ 70bbcb52acac0a3cb3217719669a8242 *./tests/data/vsynth1/y41p.avi - 7610060 ./tests/data/vsynth1/y41p.avi +7610060 ./tests/data/vsynth1/y41p.avi 665f6045e3b3031f719fa4a44f63daba *./tests/data/y41p.vsynth1.out.yuv stddev: 30.54 PSNR: 18.43 MAXDIFF: 222 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/yuv4 b/tests/ref/vsynth1/yuv4 index 63c1298281..90293bf7bb 100644 --- a/tests/ref/vsynth1/yuv4 +++ b/tests/ref/vsynth1/yuv4 @@ -1,4 +1,4 @@ e0d593eb635432f421b93224e425ee03 *./tests/data/vsynth1/yuv4.avi - 7610060 ./tests/data/vsynth1/yuv4.avi +7610060 ./tests/data/vsynth1/yuv4.avi c5ccac874dbf808e9088bc3107860042 *./tests/data/yuv4.vsynth1.out.yuv stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 |