From: Stefano Sabatini <stefasab@gmail.com>
Date: Sat, 8 Dec 2012 17:41:06 +0000 (+0100)
Subject: lavu/opt: make av_opt_query_ranges_default() return a meaningful error code
X-Git-Tag: android-x86-4.4-r1~7367
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=129d73715084620f52dd507aeab29eb8e1da490e;p=android-x86%2Fexternal-ffmpeg.git

lavu/opt: make av_opt_query_ranges_default() return a meaningful error code
---

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 098dba378e..b8ad36f1d7 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -1228,11 +1228,14 @@ int av_opt_query_ranges_default(AVOptionRanges **ranges_arg, void *obj, const ch
     AVOptionRange **range_array = av_mallocz(sizeof(void*));
     AVOptionRange *range = av_mallocz(sizeof(*range));
     const AVOption *field = av_opt_find(obj, key, NULL, 0, flags);
+    int ret;
 
     *ranges_arg = NULL;
 
-    if (!ranges || !range || !range_array || !field)
+    if (!ranges || !range || !range_array || !field) {
+        ret = AVERROR(ENOMEM);
         goto fail;
+    }
 
     ranges->range = range_array;
     ranges->range[0] = range;
@@ -1266,6 +1269,7 @@ int av_opt_query_ranges_default(AVOptionRanges **ranges_arg, void *obj, const ch
         range->value_max = INT_MAX/8;
         break;
     default:
+        ret = AVERROR(ENOSYS);
         goto fail;
     }
 
@@ -1274,7 +1278,7 @@ int av_opt_query_ranges_default(AVOptionRanges **ranges_arg, void *obj, const ch
 fail:
     av_free(ranges);
     av_free(range);
-    return -1;
+    return ret;
 }
 
 void av_opt_freep_ranges(AVOptionRanges **rangesp)