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/v308 | |
| 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/v308')
| -rw-r--r-- | tests/ref/vsynth1/v308 | 2 |
1 files changed, 1 insertions, 1 deletions
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 |