Module: libav Branch: master Commit: c5fcdb440237f06f6c954185ab60970cabf786a2
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Sat Feb 2 17:23:19 2013 +0100 error_resilience: remove a useless if() and FIXME pp_time is never set for h264 --- libavcodec/error_resilience.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index ae9ef68..67552df 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -1157,11 +1157,7 @@ void ff_er_frame_end(MpegEncContext *s) int time_pp = s->pp_time; int time_pb = s->pb_time; - if (s->avctx->codec_id == AV_CODEC_ID_H264) { - // FIXME - } else { - ff_thread_await_progress(&s->next_picture_ptr->f, mb_y, 0); - } + ff_thread_await_progress(&s->next_picture_ptr->f, mb_y, 0); s->mv[0][0][0] = s->next_picture.f.motion_val[0][xy][0] * time_pb / time_pp; s->mv[0][0][1] = s->next_picture.f.motion_val[0][xy][1] * time_pb / time_pp; s->mv[1][0][0] = s->next_picture.f.motion_val[0][xy][0] * (time_pb - time_pp) / time_pp; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
