[FFmpeg-cvslog] hpel_motion_search: move code used for asserts under correct #if

Michael Niedermayer git at videolan.org
Sat Dec 29 03:13:33 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 29 02:51:51 2012 +0100| [2fbc8ea08ed44c77312a0722c6aac25713f19f2f] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2fbc8ea08ed44c77312a0722c6aac25713f19f2f
---

 libavcodec/motion_est_template.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c
index 8dae29b..9de3612 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;



More information about the ffmpeg-cvslog mailing list