RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

h264: Mark previous field as done before throwing it away. 

This fixes some deadlock without the generic cleanup code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-02-11 20:11:18 +01:00
parent b66b58f7b0
commit f900d60178
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -2943,6 +2943,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
} else {
if (s0->current_picture_ptr->frame_num != h->frame_num) {
ff_thread_report_progress((AVFrame*)s0->current_picture_ptr, INT_MAX,
s0->picture_structure==PICT_BOTTOM_FIELD);
/*
* This and previous field had
* different frame_nums. Consider this field first in