generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoptions: Return explicitly NAN or {0,0} if the option isn't found

Browse Source 
This actually matches what av_get_double did earlier, the
0.0/0.0 division was intentional, for producing NAN.

Still keeping the check for the return value from
av_get_number, for clarity.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2011-05-25 16:47:09 +03:00
parent 48b1fb1397
commit 80068da3a0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/opt.c
View File

@ -291,7 +291,7 @@ double av_get_double(void *obj, const char *name, const AVOption **o_out)
int den=1; int den=1;
if (av_get_number(obj, name, o_out, &num, &den, &intnum) < 0) if (av_get_number(obj, name, o_out, &num, &den, &intnum) < 0)
return -1; return NAN;
return num*intnum/den; return num*intnum/den;
} }
@ -302,7 +302,7 @@ AVRational av_get_q(void *obj, const char *name, const AVOption **o_out)
int den=1; int den=1;
if (av_get_number(obj, name, o_out, &num, &den, &intnum) < 0) if (av_get_number(obj, name, o_out, &num, &den, &intnum) < 0)
return (AVRational){-1, 0}; return (AVRational){0, 0};
if (num == 1.0 && (int)intnum == intnum) if (num == 1.0 && (int)intnum == intnum)
return (AVRational){intnum, den}; return (AVRational){intnum, den};
else else