Commit ba353436 authored by Michael Niedermayer's avatar 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 45d8537c
...@@ -3975,7 +3975,7 @@ again: ...@@ -3975,7 +3975,7 @@ again:
hx->inter_gb_ptr = &hx->inter_gb; hx->inter_gb_ptr = &hx->inter_gb;
av_log(h->s.avctx, AV_LOG_ERROR, "Partitioned H.264 support is incomplete\n"); 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 && if (hx->redundant_pic_count == 0 &&
hx->intra_gb_ptr && hx->intra_gb_ptr &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment