diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 04:09:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 04:13:28 +0200 |
| commit | 7b9e98173ca7afea8dd76191f63ab6995ba01777 (patch) | |
| tree | 74993c45afd648f0792b1287cae92a4d4a9b72a8 /libavcodec/motion_est_template.c | |
| parent | d7e5aebae7652ac766034f1d90e5a4f62677fb3c (diff) | |
| download | ffmpeg-7b9e98173ca7afea8dd76191f63ab6995ba01777.tar.gz | |
Revert "Eliminate pointless '#if 1' statements without matching '#else'."
no comment
This reverts commit e6ff064845d02c43526c8a56dab121c219f16659.
Conflicts:
libavcodec/dsputil.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est_template.c')
| -rw-r--r-- | libavcodec/motion_est_template.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index 3a37bde063..8f730ef14f 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -158,6 +158,7 @@ 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 @@ -171,6 +172,7 @@ 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){ |