[FFmpeg-cvslog] avcodec/proresdec_lgpl: pass return values instead of discarding them
Paul B Mahol
git at videolan.org
Wed Apr 18 01:08:34 EEST 2018
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Apr 18 00:05:33 2018 +0200| [3c6f701524137d2dc58ff26efcf2e2c6d4b86413] | committer: Paul B Mahol
avcodec/proresdec_lgpl: pass return values instead of discarding them
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c6f701524137d2dc58ff26efcf2e2c6d4b86413
---
libavcodec/proresdec_lgpl.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libavcodec/proresdec_lgpl.c b/libavcodec/proresdec_lgpl.c
index c86d433f50..3dbfb29011 100644
--- a/libavcodec/proresdec_lgpl.c
+++ b/libavcodec/proresdec_lgpl.c
@@ -721,6 +721,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
int frame_hdr_size, pic_num, pic_data_size;
+ int ret;
ctx->frame = data;
ctx->frame->pict_type = AV_PICTURE_TYPE_I;
@@ -741,16 +742,16 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
MOVE_DATA_PTR(frame_hdr_size);
- if (ff_get_buffer(avctx, ctx->frame, 0) < 0)
- return -1;
+ if ((ret = ff_get_buffer(avctx, ctx->frame, 0)) < 0)
+ return ret;
for (pic_num = 0; ctx->frame->interlaced_frame - pic_num + 1; pic_num++) {
pic_data_size = decode_picture_header(ctx, buf, buf_size, avctx);
if (pic_data_size < 0)
return AVERROR_INVALIDDATA;
- if (decode_picture(ctx, pic_num, avctx))
- return -1;
+ if ((ret = decode_picture(ctx, pic_num, avctx)) < 0)
+ return ret;
MOVE_DATA_PTR(pic_data_size);
}
More information about the ffmpeg-cvslog
mailing list