Unified · Split
| @@ -564,12 +564,12 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, · 563 unmodified lines | |||
| 564 | 564 | ||
| 565 | mbinfo_sd = av_frame_get_side_data(frame, AV_FRAME_DATA_VIDEO_HINT); | 565 | mbinfo_sd = av_frame_get_side_data(frame, AV_FRAME_DATA_VIDEO_HINT); |
| 566 | if (mbinfo_sd) { | 566 | if (mbinfo_sd) { |
| 567 | int ret = setup_mb_info(ctx, pic, frame, (const AVVideoHint *)mbinfo_sd->data); | 567 | int err = setup_mb_info(ctx, pic, frame, (const AVVideoHint *)mbinfo_sd->data); |
| 568 | if (ret < 0) { | 568 | if (err < 0) { |
| 569 | /* No need to fail here, this is not fatal. We just proceed with no | 569 | /* No need to fail here, this is not fatal. We just proceed with no |
| 570 | * mb_info and log a message */ | 570 | * mb_info and log a message */ |
| 571 | 571 | ||
| 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)); |
| 573 | } | 573 | } |
| 574 | } | 574 | } |
| 575 | 575 | ||