From 8aa4f3bb4f772404ff43a3c8c9d5faaadafbdfdd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 4 Mar 2017 01:30:54 +0100 Subject: [PATCH] avcodec/proresdec2: Do not discard frames with bad slices The code previously completely discarded frames that had any error in a slice Signed-off-by: Michael Niedermayer --- libavcodec/proresdec2.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index a3a1ebdecb9..ff46bcfde0d 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -614,14 +614,19 @@ static int decode_picture(AVCodecContext *avctx) { ProresContext *ctx = avctx->priv_data; int i; + int error = 0; avctx->execute2(avctx, decode_slice_thread, NULL, NULL, ctx->slice_count); for (i = 0; i < ctx->slice_count; i++) - if (ctx->slices[i].ret < 0) - return ctx->slices[i].ret; + error += ctx->slices[i].ret < 0; - return 0; + if (error) + av_frame_set_decode_error_flags(ctx->frame, FF_DECODE_ERROR_INVALID_BITSTREAM); + if (error < ctx->slice_count) + return 0; + + return ctx->slices[0].ret; } static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, -- 2.39.5