summaryrefslogtreecommitdiff
path: root/libavcodec/motion_est_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-29 02:51:51 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-29 03:07:45 +0100
commit2fbc8ea08ed44c77312a0722c6aac25713f19f2f (patch)
tree07dcf75ccf796e35d9d37462440717846238d3c7 /libavcodec/motion_est_template.c
parent30872fa09be99a0af65d14f28c0c5d91120065f0 (diff)
downloadffmpeg-2fbc8ea08ed44c77312a0722c6aac25713f19f2f.tar.gz
hpel_motion_search: move code used for asserts under correct #if
This avoids compiler warnings about set but not used variables Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est_template.c')
-rw-r--r--libavcodec/motion_est_template.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c
index 8dae29bcc8..9de36129a2 100644
--- a/libavcodec/motion_est_template.c
+++ b/libavcodec/motion_est_template.c
@@ -89,7 +89,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
+#if ASSERT_LEVEL > 1
unsigned key;
unsigned map_generation= c->map_generation;
key= ((my-1)<<ME_MAP_MV_BITS) + (mx) + map_generation;