[FFmpeg-cvslog] fftools/ffmpeg_filter: remove accidental variable shadowing

James Almer git at videolan.org
Mon Jan 27 01:56:18 EET 2025


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Jan 26 20:53:11 2025 -0300| [f632ab53d98168b9b731cf5696547c26059c0822] | committer: James Almer

fftools/ffmpeg_filter: remove accidental variable shadowing

Fixes potential uses of uninitialized variables in case of alloc failure.

Signed-off-by: James Almer <jamrial at gmail.com>

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

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

diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 7992c01948..a0d04fd76f 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -1920,7 +1920,7 @@ static int configure_filtergraph(FilterGraph *fg, FilterGraphThread *fgt)
     FilterGraphPriv *fgp = fgp_from_fg(fg);
     AVBufferRef *hw_device;
     AVFilterInOut *inputs, *outputs, *cur;
-    int ret, i, simple = filtergraph_is_simple(fg);
+    int ret = AVERROR_BUG, i, simple = filtergraph_is_simple(fg);
     int have_input_eof = 0;
     const char *graph_desc = fgp->graph_desc;
 
@@ -2029,8 +2029,8 @@ static int configure_filtergraph(FilterGraph *fg, FilterGraphThread *fgt)
         sd = av_buffersink_get_side_data(sink, &nb_sd);
         if (nb_sd)
             for (int j = 0; j < nb_sd; j++) {
-                int ret = av_frame_side_data_clone(&ofp->side_data, &ofp->nb_side_data,
-                                                   sd[j], 0);
+                ret = av_frame_side_data_clone(&ofp->side_data, &ofp->nb_side_data,
+                                               sd[j], 0);
                 if (ret < 0) {
                     av_frame_side_data_free(&ofp->side_data, &ofp->nb_side_data);
                     goto fail;



More information about the ffmpeg-cvslog mailing list