diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-19 03:37:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-19 04:08:11 +0100 |
| commit | ba353436a375b92659366aeec8c0139da08f8a0b (patch) | |
| tree | 79e71a9f7f3ec98585915438e90a3f3a997b6228 | |
| parent | 45d8537ccf22f8970959828e17fccc51d5bfc86d (diff) | |
| download | ffmpeg-ba353436a375b92659366aeec8c0139da08f8a0b.tar.gz | |
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@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 && |