diff mbox series

[FFmpeg-devel,24/60] avcodec/libx264: fix variable shadowing

Message ID D41CE2FHWV40.2IY1B8G1JHM2D@gmail.com
State Accepted
Headers show
Series [FFmpeg-devel,01/60] fftools/ffmpeg_opt: fix variable shadowing | expand

Commit Message

Marvin Scholz Sept. 8, 2024, 8:50 p.m. UTC 
---
 libavcodec/libx264.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Anton Khirnov Sept. 13, 2024, 10:01 a.m. UTC | #1 
Quoting Marvin Scholz (2024-09-08 22:50:45)
> ---
>  libavcodec/libx264.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Looks ok
diff mbox series

Patch

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index d07a65a103..fc0f182bf4 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -564,12 +564,12 @@  static int setup_frame(AVCodecContext *ctx, const AVFrame *frame,
 
     mbinfo_sd = av_frame_get_side_data(frame, AV_FRAME_DATA_VIDEO_HINT);
     if (mbinfo_sd) {
-        int ret = setup_mb_info(ctx, pic, frame, (const AVVideoHint *)mbinfo_sd->data);
-        if (ret < 0) {
+        int err = setup_mb_info(ctx, pic, frame, (const AVVideoHint *)mbinfo_sd->data);
+        if (err < 0) {
             /* No need to fail here, this is not fatal. We just proceed with no
              * mb_info and log a message */
 
-            av_log(ctx, AV_LOG_WARNING, "setup_mb_info failed with error: %s\n", av_err2str(ret));
+            av_log(ctx, AV_LOG_WARNING, "setup_mb_info failed with error: %s\n", av_err2str(err));
         }
     }