From: Michael Niedermayer Date: Tue, 19 Feb 2013 19:26:55 +0000 (+0100) Subject: h264/field_end move progress report code after error concealment. X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e2b30194bb7ec39770a96e78458e7f3087c50f24;p=ffmpeg h264/field_end move progress report code after error concealment. Signed-off-by: Michael Niedermayer --- diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 3142ca43076..b8ee861d71b 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;