[FFmpeg-cvslog] fftools/cmdutils: fix variable shadowing

Marvin Scholz git at videolan.org
Fri Sep 13 01:36:14 EEST 2024


ffmpeg | branch: master | Marvin Scholz <epirat07 at gmail.com> | Sun Sep  8 19:58:16 2024 +0200| [4c6d07dd286562a78ac0c74a68bdb85a8e218423] | committer: Marvin Scholz

fftools/cmdutils: fix variable shadowing

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

 fftools/cmdutils.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index f725c31c12..a9a7ff4194 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -802,7 +802,7 @@ int split_commandline(OptionParseContext *octx, int argc, char *argv[],
     while (optindex < argc) {
         const char *opt = argv[optindex++], *arg;
         const OptionDef *po;
-        int ret, group_idx;
+        int group_idx;
 
         av_log(NULL, AV_LOG_DEBUG, "Reading option '%s' ...", opt);
 
@@ -1366,7 +1366,7 @@ int filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_id,
 }
 
 int setup_find_stream_info_opts(AVFormatContext *s,
-                                AVDictionary *codec_opts,
+                                AVDictionary *local_codec_opts,
                                 AVDictionary ***dst)
 {
     int ret;
@@ -1382,7 +1382,7 @@ int setup_find_stream_info_opts(AVFormatContext *s,
         return AVERROR(ENOMEM);
 
     for (int i = 0; i < s->nb_streams; i++) {
-        ret = filter_codec_opts(codec_opts, s->streams[i]->codecpar->codec_id,
+        ret = filter_codec_opts(local_codec_opts, s->streams[i]->codecpar->codec_id,
                                 s, s->streams[i], NULL, &opts[i], NULL);
         if (ret < 0)
             goto fail;



More information about the ffmpeg-cvslog mailing list