[FFmpeg-devel] [PATCH 5/6] h264/decode_nal_units: only mark frame as done on fatal errors.

Michael Niedermayer michaelni at gmx.at
Tue Feb 19 20:48:04 CET 2013


This is needed for frame threading and error concealment

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavcodec/h264.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 5f8619d..d141be5 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4670,7 +4670,7 @@ again:
 
 end:
     /* clean up */
-    if (h->cur_pic_ptr && h->cur_pic_ptr->owner2 == h &&
+    if (h->cur_pic_ptr && h->cur_pic_ptr->owner2 == h && buf_index < 0 &&
         !h->droppable) {
         ff_thread_report_progress(&h->cur_pic_ptr->f, INT_MAX,
                                   h->picture_structure == PICT_BOTTOM_FIELD);
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list