diff --git a/configure b/configure
index 2aff8e2590..104af0bebf 100755
--- a/configure
+++ b/configure
@@ -1840,7 +1840,7 @@ sonic_ls_encoder_select="golomb"
 sp5x_decoder_select="dsputil"
 svq1_decoder_select="hpeldsp"
 svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc"
-svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel mpegvideo videodsp"
+svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel hpeldsp mpegvideo videodsp"
 svq3_decoder_suggest="error_resilience zlib"
 tak_decoder_select="dsputil"
 theora_decoder_select="vp3_decoder"
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index dc8e39b581..9c36ab6fed 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -338,9 +338,11 @@ int ff_init_me(MpegEncContext *s){
         else
             c->sub_motion_search= hpel_motion_search;
     }
-    c->hpel_avg= s->hdsp.avg_pixels_tab;
-    if(s->no_rounding) c->hpel_put= s->hdsp.put_no_rnd_pixels_tab;
-    else               c->hpel_put= s->hdsp.put_pixels_tab;
+    c->hpel_avg = s->hdsp.avg_pixels_tab;
+    if (s->no_rounding)
+        c->hpel_put = s->hdsp.put_no_rnd_pixels_tab;
+    else
+        c->hpel_put = s->hdsp.put_pixels_tab;
 
     if(s->linesize){
         c->stride  = s->linesize;