[FFmpeg-cvslog] avutil/opt: Check av_parse_video_rate()s return value

Michael Niedermayer git at videolan.org
Sun Dec 7 13:41:25 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec  7 02:57:39 2014 +0100| [ace91616558f189fbe84ac7f9b66167a999fcc61] | committer: Michael Niedermayer

avutil/opt: Check av_parse_video_rate()s return value

Fixes CID1257008

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ace91616558f189fbe84ac7f9b66167a999fcc61
---

 libavutil/opt.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index e43b5d8..4cf2069 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -1811,8 +1811,10 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o)
         return (w == *(int *)dst) && (h == *((int *)dst+1));
     case AV_OPT_TYPE_VIDEO_RATE:
         q = (AVRational){0, 0};
-        if (o->default_val.str)
-            av_parse_video_rate(&q, o->default_val.str);
+        if (o->default_val.str) {
+            if ((ret = av_parse_video_rate(&q, o->default_val.str)) < 0)
+                return ret;
+        }
         return !av_cmp_q(*(AVRational*)dst, q);
     case AV_OPT_TYPE_COLOR: {
         uint8_t color[4] = {0, 0, 0, 0};



More information about the ffmpeg-cvslog mailing list