virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avcodec/libx264: fix variable shadowing

Browse Source
This commit is contained in:
Marvin Scholz 2024-09-08 22:50:45 +02:00
parent 0f87ff0db4
commit 0753d17664
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/libx264.c
View File

@ -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));
}
}