[FFmpeg-cvslog] h264: dont stop parsing NALs without cleanup on DPC.

Michael Niedermayer git at videolan.org
Mon Nov 19 04:12:33 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 19 03:37:59 2012 +0100| [ba353436a375b92659366aeec8c0139da08f8a0b] | committer: Michael Niedermayer

h264: dont stop parsing NALs without cleanup on DPC.

Fixes a deadlock with frame threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/h264.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 32cede5..d9469e8 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3975,7 +3975,7 @@ again:
                 hx->inter_gb_ptr = &hx->inter_gb;
 
                 av_log(h->s.avctx, AV_LOG_ERROR, "Partitioned H.264 support is incomplete\n");
-                return AVERROR_PATCHWELCOME;
+                break;
 
                 if (hx->redundant_pic_count == 0 &&
                     hx->intra_gb_ptr &&



More information about the ffmpeg-cvslog mailing list