[FFmpeg-cvslog] avcodec/proresdec2: Do not discard frames with bad slices

Michael Niedermayer git at videolan.org
Mon Mar 6 17:48:48 EET 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Mar  4 01:30:54 2017 +0100| [8aa4f3bb4f772404ff43a3c8c9d5faaadafbdfdd] | committer: Michael Niedermayer

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 <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8aa4f3bb4f772404ff43a3c8c9d5faaadafbdfdd
---

 libavcodec/proresdec2.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c
index a3a1ebd..ff46bcf 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,



More information about the ffmpeg-cvslog mailing list