[FFmpeg-devel] [PATCH 11/38] lavu/opt: simplify error handling in get_number()

Anton Khirnov anton at khirnov.net
Fri Feb 23 15:58:33 EET 2024


---
 libavutil/opt.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 54a99c689c..75a27c4d9b 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -961,16 +961,11 @@ static int get_number(void *obj, const char *name, double *num, int *den, int64_
     void *dst, *target_obj;
     const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj);
     if (!o || !target_obj)
-        goto error;
+        return AVERROR_OPTION_NOT_FOUND;
 
     dst = ((uint8_t *)target_obj) + o->offset;
 
     return read_number(o, dst, num, den, intnum);
-
-error:
-    *den    =
-    *intnum = 0;
-    return -1;
 }
 
 int av_opt_get_int(void *obj, const char *name, int search_flags, int64_t *out_val)
-- 
2.42.0



More information about the ffmpeg-devel mailing list