diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-19 20:26:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-24 22:34:17 +0100 |
| commit | e2b30194bb7ec39770a96e78458e7f3087c50f24 (patch) | |
| tree | 544baac9c06a0f7e34bdfa5783353f9b5903fa56 /libavcodec/h264.c | |
| parent | 386dc9a3a8bc8e4c751a5725f9030955bfb5f2da (diff) | |
| download | ffmpeg-e2b30194bb7ec39770a96e78458e7f3087c50f24.tar.gz | |
h264/field_end move progress report code after error concealment.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 3142ca4307..b8ee861d71 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2821,10 +2821,6 @@ static int field_end(H264Context *h, int in_setup) int err = 0; h->mb_y = 0; - if (!in_setup && !h->droppable) - ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, - h->picture_structure == PICT_BOTTOM_FIELD); - if (CONFIG_H264_VDPAU_DECODER && h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) ff_vdpau_h264_set_reference_frames(h); @@ -2867,6 +2863,9 @@ static int field_end(H264Context *h, int in_setup) h->er.cur_pic = h->cur_pic_ptr; ff_er_frame_end(&h->er); } + if (!in_setup && !h->droppable) + ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, + h->picture_structure == PICT_BOTTOM_FIELD); emms_c(); h->current_slice = 0; |