diff --git a/libavcodec/bfin/Makefile b/libavcodec/bfin/Makefile
index f7a5f42103..c293360205 100644
--- a/libavcodec/bfin/Makefile
+++ b/libavcodec/bfin/Makefile
@@ -3,7 +3,7 @@ OBJS += bfin/dsputil_bfin.o                                             \
         bfin/idct_bfin.o                                                \
         bfin/pixels_bfin.o                                              \
 
-OBJS-$(CONFIG_HPELDS)                   += bfin/hpeldsp_bfin.o          \
+OBJS-$(CONFIG_HPELDSP)                  += bfin/hpeldsp_bfin.o          \
                                            bfin/hpel_pixels_bfin.o
 OBJS-$(CONFIG_MPEGVIDEOENC)             += bfin/mpegvideo_bfin.o
 OBJS-$(CONFIG_VP3DSP)                   += bfin/vp3_bfin.o              \
diff --git a/libavcodec/bfin/hpel_pixels_bfin.S b/libavcodec/bfin/hpel_pixels_bfin.S
index b22bc29f9e..c0cbf1f7f9 100644
--- a/libavcodec/bfin/hpel_pixels_bfin.S
+++ b/libavcodec/bfin/hpel_pixels_bfin.S
@@ -20,7 +20,7 @@
  */
 #include "config_bfin.h"
 
-/**
+/*
   motion compensation
   primitives
 
diff --git a/libavcodec/bfin/hpeldsp_bfin.c b/libavcodec/bfin/hpeldsp_bfin.c
index 8b4af49868..2df551b89a 100644
--- a/libavcodec/bfin/hpeldsp_bfin.c
+++ b/libavcodec/bfin/hpeldsp_bfin.c
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
 #include "libavcodec/hpeldsp.h"
 #include "hpeldsp_bfin.h"
 
@@ -95,7 +99,7 @@ static void bfin_put_pixels16_y2_nornd (uint8_t *block, const uint8_t *pixels, p
     ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+line_size, line_size, h);
 }
 
-void ff_hpeldsp_init_bfin(HpelDSPContext* c, int flags)
+av_cold void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags)
 {
     c->put_pixels_tab[0][0] = bfin_put_pixels16;
     c->put_pixels_tab[0][1] = bfin_put_pixels16_x2;
diff --git a/libavcodec/hpeldsp.c b/libavcodec/hpeldsp.c
index a01b322e87..bff779d827 100644
--- a/libavcodec/hpeldsp.c
+++ b/libavcodec/hpeldsp.c
@@ -54,14 +54,18 @@ av_cold void ff_hpeldsp_init(HpelDSPContext *c, int flags)
     hpel_funcs(avg, [3],  2);
     hpel_funcs(avg_no_rnd,, 16);
 
+    if (ARCH_ALPHA)
+        ff_hpeldsp_init_alpha(c, flags);
     if (ARCH_ARM)
         ff_hpeldsp_init_arm(c, flags);
+    if (ARCH_BFIN)
+        ff_hpeldsp_init_bfin(c, flags);
     if (ARCH_PPC)
         ff_hpeldsp_init_ppc(c, flags);
+    if (ARCH_SH4)
+        ff_hpeldsp_init_sh4(c, flags);
+    if (HAVE_VIS)
+        ff_hpeldsp_init_vis(c, flags);
     if (ARCH_X86)
         ff_hpeldsp_init_x86(c, flags);
-    if (HAVE_VIS)        ff_hpeldsp_init_vis   (c, flags);
-    if (ARCH_ALPHA)      ff_hpeldsp_init_alpha (c, flags);
-    if (ARCH_SH4)        ff_hpeldsp_init_sh4   (c, flags);
-    if (ARCH_BFIN)       ff_hpeldsp_init_bfin  (c, flags);
 }
diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h
index a6a2ff0e41..bd53edd682 100644
--- a/libavcodec/hpeldsp.h
+++ b/libavcodec/hpeldsp.h
@@ -100,9 +100,9 @@ void ff_hpeldsp_init(HpelDSPContext *c, int flags);
 void ff_hpeldsp_init_alpha(HpelDSPContext* c, int flags);
 void ff_hpeldsp_init_arm(HpelDSPContext* c, int flags);
 void ff_hpeldsp_init_bfin(HpelDSPContext* c, int flags);
-void ff_hpeldsp_init_x86(HpelDSPContext* c, int flags);
 void ff_hpeldsp_init_ppc(HpelDSPContext* c, int flags);
 void ff_hpeldsp_init_sh4(HpelDSPContext* c, int flags);
 void ff_hpeldsp_init_vis(HpelDSPContext* c, int flags);
+void ff_hpeldsp_init_x86(HpelDSPContext* c, int flags);
 
 #endif /* AVCODEC_HPELDSP_H */