[FFmpeg-cvslog] avutil/opt: Simplify av_opt_set_dict2()

Andreas Rheinhardt git at videolan.org
Mon Sep 20 03:15:22 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Sep 13 13:35:36 2021 +0200| [3df34e7bf7bd75d9fa2ca83f7d5baec45cc95a1c] | committer: Andreas Rheinhardt

avutil/opt: Simplify av_opt_set_dict2()

Make it clearer that the ordinary exit always returns 0.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

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

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 24b8899ca0..f05283d610 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -1635,7 +1635,7 @@ int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags)
 {
     AVDictionaryEntry *t = NULL;
     AVDictionary    *tmp = NULL;
-    int ret = 0;
+    int ret;
 
     if (!options)
         return 0;
@@ -1649,11 +1649,10 @@ int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags)
             av_dict_free(&tmp);
             return ret;
         }
-        ret = 0;
     }
     av_dict_free(options);
     *options = tmp;
-    return ret;
+    return 0;
 }
 
 int av_opt_set_dict(void *obj, AVDictionary **options)



More information about the ffmpeg-cvslog mailing list