From ba353436a375b92659366aeec8c0139da08f8a0b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 19 Nov 2012 03:37:59 +0100 Subject: 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 --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 32cede5eea..d9469e82b6 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 && -- cgit v1.2.3