mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-08-13 17:07:21 +00:00
avcodec/decode: Fix shadowing
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
committed by
James Almer
parent
f99e4a0f23
commit
b595b3075e
@@ -1570,7 +1570,7 @@ int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx,
|
||||
}
|
||||
|
||||
if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
|
||||
int ret = av_buffer_replace(&frame->opaque_ref, pkt->opaque_ref);
|
||||
ret = av_buffer_replace(&frame->opaque_ref, pkt->opaque_ref);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
frame->opaque = pkt->opaque;
|
||||
@@ -1630,7 +1630,7 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
|
||||
av_frame_get_side_data(frame, AV_FRAME_DATA_LCEVC);
|
||||
|
||||
if (dc->lcevc.frame) {
|
||||
int ret = ff_lcevc_parse_frame(dc->lcevc.ctx, frame, &dc->lcevc.format,
|
||||
ret = ff_lcevc_parse_frame(dc->lcevc.ctx, frame, &dc->lcevc.format,
|
||||
&dc->lcevc.width, &dc->lcevc.height, avctx);
|
||||
if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
|
||||
return ret;
|
||||
|
||||
Reference in New Issue
Block a user