From: Martin Storsjö <martin@martin.st>
Date: Wed, 25 May 2011 13:47:09 +0000 (+0300)
Subject: avoptions: Return explicitly NAN or {0,0} if the option isn't found
X-Git-Tag: v0.7rc1~318
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80068da3a0bafc7e24ce6b1f91cefec7d793b4d2;p=platform%2Fupstream%2Flibav.git

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

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>
---

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 9e06b01..74c39fe 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -291,7 +291,7 @@ double av_get_double(void *obj, const char *name, const AVOption **o_out)
     int den=1;
 
     if (av_get_number(obj, name, o_out, &num, &den, &intnum) < 0)
-        return -1;
+        return NAN;
     return num*intnum/den;
 }
 
@@ -302,7 +302,7 @@ AVRational av_get_q(void *obj, const char *name, const AVOption **o_out)
     int den=1;
 
     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)
         return (AVRational){intnum, den};
     else