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/vsynth2 | |
| parent | 4d3787763218de4c3e838b31f0fb2153b8d6af20 (diff) | |
| parent | 6ce51a9b392aaf647c4cdfd149fff1af5259a6fd (diff) | |
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/vsynth2')
| -rw-r--r-- | tests/ref/vsynth2/cljr | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/dnxhd_720p_10bit | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/ffvhuff | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/r210 | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/v308 | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/y41p | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/yuv4 | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/tests/ref/vsynth2/cljr b/tests/ref/vsynth2/cljr index 75466437ff..f4cf7d1720 100644 --- a/tests/ref/vsynth2/cljr +++ b/tests/ref/vsynth2/cljr @@ -1,4 +1,4 @@ fdc1926e0a599de94513f0a3472b598f *./tests/data/vsynth2/cljr.avi - 5075660 ./tests/data/vsynth2/cljr.avi +5075660 ./tests/data/vsynth2/cljr.avi 7df03229ee6361ea11a0d83d4926cb10 *./tests/data/cljr.vsynth2.out.yuv stddev: 10.30 PSNR: 27.87 MAXDIFF: 65 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/dnxhd_720p_10bit b/tests/ref/vsynth2/dnxhd_720p_10bit index 60c0d84a34..9409e246cf 100644 --- a/tests/ref/vsynth2/dnxhd_720p_10bit +++ b/tests/ref/vsynth2/dnxhd_720p_10bit @@ -1,4 +1,4 @@ 4b57da2c0c1280469ff3579f7151c227 *./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd - 2293760 ./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd +2293760 ./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd 31a6aa8b8702e85fa3b48e73f035c4e4 *./tests/data/dnxhd_720p_10bit.vsynth2.out.yuv stddev: 1.35 PSNR: 45.46 MAXDIFF: 23 bytes: 760320/ 7603200 diff --git a/tests/ref/vsynth2/ffvhuff b/tests/ref/vsynth2/ffvhuff index 6d77e2a027..844be3e80c 100644 --- a/tests/ref/vsynth2/ffvhuff +++ b/tests/ref/vsynth2/ffvhuff @@ -1,4 +1,4 @@ 63926d8835dd5779dca0a4bc081ca8ae *./tests/data/vsynth2/ffvhuff.avi - 4988056 ./tests/data/vsynth2/ffvhuff.avi +4988056 ./tests/data/vsynth2/ffvhuff.avi dde5895817ad9d219f79a52d0bdfb001 *./tests/data/ffvhuff.vsynth2.out.yuv stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/r210 b/tests/ref/vsynth2/r210 index c7e1373e8b..0ae6c816e5 100644 --- a/tests/ref/vsynth2/r210 +++ b/tests/ref/vsynth2/r210 @@ -1,4 +1,4 @@ d7a6f298e6869a74c0988fc3b30d0351 *./tests/data/vsynth2/r210.avi - 22125260 ./tests/data/vsynth2/r210.avi +22125260 ./tests/data/vsynth2/r210.avi 6ea4fcd93fc83defc8770e85b64b60bb *./tests/data/r210.vsynth2.out.yuv stddev: 0.70 PSNR: 51.12 MAXDIFF: 12 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/v308 b/tests/ref/vsynth2/v308 index 2c4f7e1ef0..2cc2a4bfdf 100644 --- a/tests/ref/vsynth2/v308 +++ b/tests/ref/vsynth2/v308 @@ -1,4 +1,4 @@ 214671673e6c82bad8190d0329f01fdc *./tests/data/vsynth2/v308.avi - 15213260 ./tests/data/vsynth2/v308.avi +15213260 ./tests/data/vsynth2/v308.avi d43cb310c130c69214332d74f6ee5f9a *./tests/data/v308.vsynth2.out.yuv stddev: 0.41 PSNR: 55.80 MAXDIFF: 7 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/y41p b/tests/ref/vsynth2/y41p index e603c6b189..ce88b7faf3 100644 --- a/tests/ref/vsynth2/y41p +++ b/tests/ref/vsynth2/y41p @@ -1,4 +1,4 @@ 8e0139963e79180a0fc1c154e36cebe5 *./tests/data/vsynth2/y41p.avi - 7610060 ./tests/data/vsynth2/y41p.avi +7610060 ./tests/data/vsynth2/y41p.avi 0e0996e1d8b62f02af91fabb3c0a6f76 *./tests/data/y41p.vsynth2.out.yuv stddev: 9.87 PSNR: 28.24 MAXDIFF: 61 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/yuv4 b/tests/ref/vsynth2/yuv4 index 99d7e820cd..026a8762d9 100644 --- a/tests/ref/vsynth2/yuv4 +++ b/tests/ref/vsynth2/yuv4 @@ -1,4 +1,4 @@ 3d24f1d320c4ead1efbf3c952a902379 *./tests/data/vsynth2/yuv4.avi - 7610060 ./tests/data/vsynth2/yuv4.avi +7610060 ./tests/data/vsynth2/yuv4.avi dde5895817ad9d219f79a52d0bdfb001 *./tests/data/yuv4.vsynth2.out.yuv stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 |