[FFmpeg-cvslog] avcodec/libx264: fix variable shadowing

[Marvin Scholz]

ffmpeg | branch: master | Marvin Scholz <epirat07 at gmail.com> | Sun Sep  8 22:50:45 2024 +0200| [0753d176649acf8ad352221fbfdbafd67e61fb0c] | committer: Marvin Scholz

avcodec/libx264: fix variable shadowing

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

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

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index ff849a7ac4..409f45fc7d 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));
         }
     }