diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-02 17:23:19 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-02-06 21:46:55 +0100 |
| commit | c5fcdb440237f06f6c954185ab60970cabf786a2 (patch) | |
| tree | 50436ee38d98192a96145ce5dcc28bb8d137030d /libavcodec/error_resilience.c | |
| parent | 9782c778a205dc63443d47142dfeea602f697b55 (diff) | |
| download | ffmpeg-c5fcdb440237f06f6c954185ab60970cabf786a2.tar.gz | |
error_resilience: remove a useless if() and FIXME
pp_time is never set for h264
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | 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 ae9ef68617..67552dfd82 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; |