generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: dont stop parsing NALs without cleanup on DPC.

Browse Source 
Fixes a deadlock with frame threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-19 03:37:59 +01:00
parent 45d8537ccf
commit ba353436a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -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 &&