From 9782c778a205dc63443d47142dfeea602f697b55 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 4 Feb 2013 14:46:55 +0100 Subject: [PATCH 1/2] h264: remove silly macros They serve no useful purpose and wreak all kind of havoc when h264.h is included elsewhere. --- libavcodec/h264.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 2317d6aeff..c4addbef48 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 From c5fcdb440237f06f6c954185ab60970cabf786a2 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 2 Feb 2013 17:23:19 +0100 Subject: [PATCH 2/2] error_resilience: remove a useless if() and FIXME pp_time is never set for h264 --- libavcodec/error_resilience.c | 6 +----- 1 file changed, 1 insertion(+), 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;