Browse Source

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>
tags/n0.11
Michael Niedermayer 13 years ago
parent
commit
f900d60178
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      libavcodec/h264.c

+ 2
- 0
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


Loading…
Cancel
Save