diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 13:58:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 14:03:12 +0200 |
| commit | de31814ab07fd971d24c66a5e1ecf464b7ebe033 (patch) | |
| tree | 42c68ea4d18cdfbac8051772d9853ac7d50b2f7b /tests/ref/fate | |
| parent | c4aaff8c02cecfe42b730cb922521e4b9f26df30 (diff) | |
| parent | b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6 (diff) | |
| download | ffmpeg-streaming-de31814ab07fd971d24c66a5e1ecf464b7ebe033.zip ffmpeg-streaming-de31814ab07fd971d24c66a5e1ecf464b7ebe033.tar.gz | |
Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'
* commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6':
avio: introduce avio_closep
mpegtsenc: set muxing type notification to verbose
vc1dec: Use correct spelling of "opposite"
a64multienc: change mc_frame_counter to unsigned
arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)
svq1: Drop a bunch of useless parentheses
parseutils-test: do not print numerical error codes
svq1: K&R formatting cosmetics
Conflicts:
doc/APIchanges
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavformat/version.h
libavutil/parseutils.c
tests/ref/fate/parseutils
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate')
| -rw-r--r-- | tests/ref/fate/parseutils | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/tests/ref/fate/parseutils b/tests/ref/fate/parseutils index 5bf1cae..36756a8 100644 --- a/tests/ref/fate/parseutils +++ b/tests/ref/fate/parseutils @@ -1,29 +1,29 @@ Testing av_parse_video_rate() -'-inf' -> -1/0 error -'inf' -> 1/0 error -'nan' -> 0/0 error -'123/0' -> 1/0 error -'-123 / 0' -> -1/0 error -'' -> 0/0 error -'/' -> 0/0 error -' 123 / 321' -> 41/107 -'foo/foo' -> 0/0 error -'foo/1' -> 0/0 error -'1/foo' -> 1/0 error -'0/0' -> 0/0 error -'/0' -> 0/0 error -'1/' -> 1/0 error -'1' -> 1/1 -'0' -> 0/1 error -'-123/123' -> -1/1 error -'-foo' -> 0/0 error -'123.23' -> 12323/100 -'.23' -> 23/100 -'-.23' -> -23/100 error -'-0.234' -> -117/500 error -'-0.0000001' -> 0/1 error -' 21332.2324 ' -> 917286/43 -' -21332.2324 ' -> -917286/43 error +'-inf' -> -1/0 ERROR +'inf' -> 1/0 ERROR +'nan' -> 0/0 ERROR +'123/0' -> 1/0 ERROR +'-123 / 0' -> -1/0 ERROR +'' -> 0/0 ERROR +'/' -> 0/0 ERROR +' 123 / 321' -> 41/107 OK +'foo/foo' -> 0/0 ERROR +'foo/1' -> 0/0 ERROR +'1/foo' -> 1/0 ERROR +'0/0' -> 0/0 ERROR +'/0' -> 0/0 ERROR +'1/' -> 1/0 ERROR +'1' -> 1/1 OK +'0' -> 0/1 ERROR +'-123/123' -> -1/1 ERROR +'-foo' -> 0/0 ERROR +'123.23' -> 12323/100 OK +'.23' -> 23/100 OK +'-.23' -> -23/100 ERROR +'-0.234' -> -117/500 ERROR +'-0.0000001' -> 0/1 ERROR +' 21332.2324 ' -> 917286/43 OK +' -21332.2324 ' -> -917286/43 ERROR Testing av_parse_color() bikeshed -> R(80) G(64) B(140) A(59) |
