diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 01:21:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 01:23:16 +0200 |
| commit | 39afcf1d7eba8f2f3d59c973aa57df714e679629 (patch) | |
| tree | b56a004e08c68a38cc15becdec66bf528bd26478 /tests | |
| parent | 2c501ae82b847d89c93e8aa1f4506fb564c344a7 (diff) | |
| parent | 2d497c141d1fb6df290cdf45404b01ea1697d618 (diff) | |
| download | ffmpeg-39afcf1d7eba8f2f3d59c973aa57df714e679629.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
eval: add gt(), gte(), lt() and lte() fate tests
eval: fix swapping of lt() and lte()
imgconvert: deprecate avcodec_find_best_pix_fmt()
imgconvert: add avcodec_find_best_pix_fmt2()
imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt
Conflicts:
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/fate/eval | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/tests/ref/fate/eval b/tests/ref/fate/eval index b0723dff14..d58cc80ab3 100644 --- a/tests/ref/fate/eval +++ b/tests/ref/fate/eval @@ -94,6 +94,30 @@ Evaluating 'st(0, 123)' Evaluating 'st(1, 123); ld(1)' 'st(1, 123); ld(1)' -> 123.000000 +Evaluating 'lte(0, 1)' +'lte(0, 1)' -> 1.000000 + +Evaluating 'lte(1, 1)' +'lte(1, 1)' -> 1.000000 + +Evaluating 'lte(1, 0)' +'lte(1, 0)' -> 0.000000 + +Evaluating 'lt(0, 1)' +'lt(0, 1)' -> 1.000000 + +Evaluating 'lt(1, 1)' +'lt(1, 1)' -> 0.000000 + +Evaluating 'gt(1, 0)' +'gt(1, 0)' -> 1.000000 + +Evaluating 'gt(2, 7)' +'gt(2, 7)' -> 0.000000 + +Evaluating 'gte(122, 122)' +'gte(122, 122)' -> 1.000000 + Evaluating 'st(0, 1); while(lte(ld(0), 100), st(1, ld(1)+ld(0));st(0, ld(0)+1)); ld(1)' 'st(0, 1); while(lte(ld(0), 100), st(1, ld(1)+ld(0));st(0, ld(0)+1)); ld(1)' -> 5050.000000 |