diff options
| author | Marvin Scholz <epirat07@gmail.com> | 2024-09-08 22:50:45 +0200 |
|---|---|---|
| committer | Marvin Scholz <epirat07@gmail.com> | 2024-09-13 19:40:46 +0200 |
| commit | 0753d176649acf8ad352221fbfdbafd67e61fb0c (patch) | |
| tree | f3b642571f4673c7e22c6fc7affb205172b64961 /libavcodec/libx264.c | |
| parent | 0f87ff0db41df2dde91f51da833316cf050a73e2 (diff) | |
| download | ffmpeg-0753d176649acf8ad352221fbfdbafd67e61fb0c.tar.gz | |
avcodec/libx264: fix variable shadowing
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 6 |
1 files 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)); } } |