diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:48:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:49:04 +0100 |
| commit | 7f23b2a9d0da328e6939de87a0ef509842b3a907 (patch) | |
| tree | 1af3172fb0bc945b690e5ea2623672b19a1b51e8 | |
| parent | d5518545d1b6df40d71e43dab8ada97710273db3 (diff) | |
| parent | c5fcdb440237f06f6c954185ab60970cabf786a2 (diff) | |
| download | ffmpeg-7f23b2a9d0da328e6939de87a0ef509842b3a907.tar.gz | |
Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'
* commit 'c5fcdb440237f06f6c954185ab60970cabf786a2':
error_resilience: remove a useless if() and FIXME
h264: remove silly macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/error_resilience.c | 6 | ||||
| -rw-r--r-- | libavcodec/h264.h | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 2b6bc42ade..eea5d6d5eb 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -1186,11 +1186,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; diff --git a/libavcodec/h264.h b/libavcodec/h264.h index e4e5ec286d..b0d44cc3d4 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -37,9 +37,6 @@ #include "h264qpel.h" #include "rectangle.h" -#define interlaced_dct interlaced_dct_is_a_bad_name -#define mb_intra mb_intra_is_not_initialized_see_mb_type - #define MAX_SPS_COUNT 32 #define MAX_PPS_COUNT 256 |