RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

parseutils: use strings instead of integers for error codes. 

error values can differ between platforms.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-09 02:53:42 +02:00
parent 9501b93241
commit f8b536a786
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/parseutils.c
View File

@ -723,10 +723,12 @@ int main(void)
for (i = 0; i < FF_ARRAY_ELEMS(rates); i++) {
int ret;
char err[1024];
AVRational q = (AVRational){0, 0};
ret = av_parse_video_rate(&q, rates[i]);
printf("'%s' -> %d/%d ret:%d\n",
rates[i], q.num, q.den, ret);
av_strerror(ret, err, sizeof(err));
printf("'%s' -> %d/%d ret:%s\n",
rates[i], q.num, q.den, err);
}
}

50
tests/ref/fate/parseutils
View File

@ -1,29 +1,29 @@
Testing av_parse_video_rate()
'-inf' -> -1/0 ret:-22
'inf' -> 1/0 ret:-22
'nan' -> 0/0 ret:-22
'123/0' -> 1/0 ret:-22
'-123 / 0' -> -1/0 ret:-22
'' -> 0/0 ret:-22
'/' -> 0/0 ret:-22
' 123 / 321' -> 41/107 ret:0
'foo/foo' -> 0/0 ret:-22
'foo/1' -> 0/0 ret:-22
'1/foo' -> 1/0 ret:-22
'0/0' -> 0/0 ret:-22
'/0' -> 0/0 ret:-22
'1/' -> 1/0 ret:-22
'1' -> 1/1 ret:0
'0' -> 0/1 ret:-22
'-123/123' -> -1/1 ret:-22
'-foo' -> 0/0 ret:-22
'123.23' -> 12323/100 ret:0
'.23' -> 23/100 ret:0
'-.23' -> -23/100 ret:-22
'-0.234' -> -117/500 ret:-22
'-0.0000001' -> 0/1 ret:-22
' 21332.2324 ' -> 917286/43 ret:0
' -21332.2324 ' -> -917286/43 ret:-22
'-inf' -> -1/0 ret:Invalid argument
'inf' -> 1/0 ret:Invalid argument
'nan' -> 0/0 ret:Invalid argument
'123/0' -> 1/0 ret:Invalid argument
'-123 / 0' -> -1/0 ret:Invalid argument
'' -> 0/0 ret:Invalid argument
'/' -> 0/0 ret:Invalid argument
' 123 / 321' -> 41/107 ret:Success
'foo/foo' -> 0/0 ret:Invalid argument
'foo/1' -> 0/0 ret:Invalid argument
'1/foo' -> 1/0 ret:Invalid argument
'0/0' -> 0/0 ret:Invalid argument
'/0' -> 0/0 ret:Invalid argument
'1/' -> 1/0 ret:Invalid argument
'1' -> 1/1 ret:Success
'0' -> 0/1 ret:Invalid argument
'-123/123' -> -1/1 ret:Invalid argument
'-foo' -> 0/0 ret:Invalid argument
'123.23' -> 12323/100 ret:Success
'.23' -> 23/100 ret:Success
'-.23' -> -23/100 ret:Invalid argument
'-0.234' -> -117/500 ret:Invalid argument
'-0.0000001' -> 0/1 ret:Invalid argument
' 21332.2324 ' -> 917286/43 ret:Success
' -21332.2324 ' -> -917286/43 ret:Invalid argument
Testing av_parse_color()
bikeshed -> R(80) G(64) B(140) A(59)