har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/proresdec2: Do not discard frames with bad slices

Browse Source 
The code previously completely discarded frames that had any error in a slice

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-03-04 01:30:54 +01:00
parent 835d9f299c
commit 8aa4f3bb4f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/proresdec2.c
View File

@ -614,14 +614,19 @@ static int decode_picture(AVCodecContext *avctx)
{ {
ProresContext *ctx = avctx->priv_data; ProresContext *ctx = avctx->priv_data;
int i; int i;
int error = 0;
avctx->execute2(avctx, decode_slice_thread, NULL, NULL, ctx->slice_count); avctx->execute2(avctx, decode_slice_thread, NULL, NULL, ctx->slice_count);
for (i = 0; i < ctx->slice_count; i++) for (i = 0; i < ctx->slice_count; i++)
if (ctx->slices[i].ret < 0) error += ctx->slices[i].ret < 0;
return ctx->slices[i].ret;
if (error)
av_frame_set_decode_error_flags(ctx->frame, FF_DECODE_ERROR_INVALID_BITSTREAM);
if (error < ctx->slice_count)
return 0; return 0;
return ctx->slices[0].ret;
} }
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,