diff options
author | Diego Biurrun <diego@biurrun.de> | 2011-04-26 13:52:12 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2011-04-26 20:18:27 +0200 |
commit | e6ff064845d02c43526c8a56dab121c219f16659 (patch) | |
tree | 2b2e1f7c601568d61cfdec616e0c7df0b5ea0f3b /libavcodec/motion_est_template.c | |
parent | 9d35fa520e3b27f7dd9fe12c433eb596f1271515 (diff) | |
download | ffmpeg-e6ff064845d02c43526c8a56dab121c219f16659.tar.gz |
Eliminate pointless '#if 1' statements without matching '#else'.
Diffstat (limited to 'libavcodec/motion_est_template.c')
-rw-r--r-- | libavcodec/motion_est_template.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index faf03d22d6..09ec9f79c4 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -158,7 +158,6 @@ static int hpel_motion_search(MpegEncContext * s, const int b= score_map[(index+(1<<ME_MAP_SHIFT))&(ME_MAP_SIZE-1)] + (mv_penalty[bx - pred_x] + mv_penalty[by+2 - pred_y])*c->penalty_factor; -#if 1 int key; int map_generation= c->map_generation; #ifndef NDEBUG @@ -172,7 +171,6 @@ static int hpel_motion_search(MpegEncContext * s, assert(map[(index+1)&(ME_MAP_SIZE-1)] == key); key= ((my)<<ME_MAP_MV_BITS) + (mx-1) + map_generation; assert(map[(index-1)&(ME_MAP_SIZE-1)] == key); -#endif if(t<=b){ CHECK_HALF_MV(0, 1, mx ,my-1) if(l<=r){ |