History

avcodec/libx264: fix variable shadowing

Marvin Scholz committed 2 years ago

Commit 0753d171 parent 0f87ff01 file · +3 −3Browse files

Unified · Split

libavcodec/libx264.c+3−3
@@ -564,12 +564,12 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, · 563 unmodified lines
564564
565565 mbinfo_sd = av_frame_get_side_data(frame, AV_FRAME_DATA_VIDEO_HINT);
566566 if (mbinfo_sd) {
567− int ret = setup_mb_info(ctx, pic, frame, (const AVVideoHint *)mbinfo_sd->data);
568− if (ret < 0) {
567+ int err = setup_mb_info(ctx, pic, frame, (const AVVideoHint *)mbinfo_sd->data);
568+ if (err < 0) {
569569 /* No need to fail here, this is not fatal. We just proceed with no
570570 * mb_info and log a message */
571571
572− av_log(ctx, AV_LOG_WARNING, "setup_mb_info failed with error: %s\n", av_err2str(ret));
572+ av_log(ctx, AV_LOG_WARNING, "setup_mb_info failed with error: %s\n", av_err2str(err));
573573 }
574574 }
575575

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t