diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-23 00:23:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-23 00:35:31 +0200 |
| commit | 28d3738428128d0bf16ff23995b08b3289179478 (patch) | |
| tree | a45fc603df658badc2cb3eef0da0b340d409ca4a /tests | |
| parent | 6c4cc0f640874f6098ef98bad54c3fc0fa7c615f (diff) | |
| parent | dcb9f6a20dbddd1f95b6b322fc4c5fd0b5315729 (diff) | |
| download | ffmpeg-28d3738428128d0bf16ff23995b08b3289179478.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add LATM demuxer
avplay: flush audio decoder with empty packets at EOF if the decoder has CODEC_CAP_DELAY set.
8svx/iff: fix decoding of compressed stereo 8svx files.
8svx: log an error message if output buffer is too small
8svx: check packet size before reading the initial sample value.
8svx: output 8-bit samples instead of 16-bit.
8svx: split delta decoding into a separate function.
mp4: Don't read an empty Decoder Config Descriptor
fate.sh: Ignore errors from rm command during cleanup.
fate.sh: Run git-pull in quiet mode to avoid console spam.
Apple ProRes decoder
rtmp: Make the input FLV parser handle data cut at any point
rv34: Check for invalid slices offsets
eval: test isnan(sqrt(-1)) instead of just sqrt(-1)
Conflicts:
Changelog
libavcodec/8svx.c
libavcodec/proresdec.c
libavcodec/version.h
libavformat/iff.c
libavformat/version.h
tests/ref/fate/eval
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/fate.sh | 4 | ||||
| -rw-r--r-- | tests/ref/fate/eval | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/fate.sh b/tests/fate.sh index 9fd117c3bc..e04c8710d7 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -35,7 +35,7 @@ checkout(){ update()( cd ${src} || return case "$repo" in - git:*) git pull ;; + git:*) git pull --quiet ;; esac ) @@ -70,7 +70,7 @@ fate()( ) clean(){ - rm -r ${build} ${inst} + rm -rf ${build} ${inst} } report(){ diff --git a/tests/ref/fate/eval b/tests/ref/fate/eval index 3bc35db633..88d7e17bee 100644 --- a/tests/ref/fate/eval +++ b/tests/ref/fate/eval @@ -136,8 +136,8 @@ Evaluating 'ceil(-123.123)' Evaluating 'sqrt(1764)' 'sqrt(1764)' -> 42.000000 -Evaluating 'sqrt(-1)' -'sqrt(-1)' -> nan +Evaluating 'isnan(sqrt(-1))' +'isnan(sqrt(-1))' -> 1.000000 Evaluating 'not(1)' 'not(1)' -> 0.000000 |