diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-18 23:12:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-18 23:39:42 +0100 |
| commit | bae053fca4cf662a223821f1e1fe43236e1cf2ff (patch) | |
| tree | 0a3c448cd41c5beaaae48a6a61430c9d6277bb7f /tests | |
| parent | 7f4c5ab8a1cc5e7be8ce70edfcaa6f926791376b (diff) | |
| parent | a56fba502e9087c204b7d6cdc8e12d623f77d66d (diff) | |
| download | ffmpeg-bae053fca4cf662a223821f1e1fe43236e1cf2ff.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: make compare() function compatible with POSIX bc
Update Janne's email address.
APIchanges: Replace Subversion revision numbers by Git hashes.
bytestream: Eliminate one level of pointless macro indirection.
xwd: convert to bytestream2.
vqavideo: port to bytestream2 API
Read preset files with suffix .avpreset
prores: allow user to set fixed quantiser
lavf: remove some disabled code.
lavf: only set average frame rate for video.
lavf: remove a pointless check.
avcodec: add XBM encoder
Conflicts:
Changelog
cmdutils.c
cmdutils.h
doc/APIchanges
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/vqavideo.c
libavformat/img2enc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/fate-run.sh | 3 | ||||
| -rw-r--r-- | tests/ref/fate/vqa-cc | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index fabf36e9d2..e9863af01c 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -31,8 +31,7 @@ repfile="${outdir}/${test}.rep" # $1=value1, $2=value2, $3=threshold # prints 0 if absolute difference between value1 and value2 is <= threshold compare(){ - v=$(echo "scale=2; if ($1 >= $2) { $1 - $2 } else { $2 - $1 }" | bc) - echo "if ($v <= $3) { 0 } else { 1 }" | bc + echo "scale=2; v = $1 - $2; if (v < 0) v = -v; if (v > $3) r = 1; r" | bc } do_tiny_psnr(){ diff --git a/tests/ref/fate/vqa-cc b/tests/ref/fate/vqa-cc index 3b00d0dae7..401a061b94 100644 --- a/tests/ref/fate/vqa-cc +++ b/tests/ref/fate/vqa-cc @@ -70,7 +70,6 @@ 1, 53654, 53654, 1470, 2940, 0xac8bb6c8 0, 37, 37, 1, 192000, 0xb58c1566 1, 55124, 55124, 1470, 2940, 0xa503c73b -0, 38, 38, 1, 192000, 0xb58c1566 1, 56594, 56594, 1470, 2940, 0x7cd588a3 1, 58064, 58064, 1470, 2940, 0xa6974b04 1, 59534, 59534, 1470, 2940, 0xbf448241 |