summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/dsputil.c1
-rw-r--r--libavcodec/dsputil_template.c4
-rw-r--r--libavcodec/hpel_template.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 861aa4cf35..dbe04263fb 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -50,6 +50,7 @@ uint32_t ff_square_tab[512] = { 0, };
#undef BIT_DEPTH
#define BIT_DEPTH 8
+#include "hpel_template.c"
#include "tpel_template.c"
#include "dsputil_template.c"
diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c
index b1070370f7..f245dc91be 100644
--- a/libavcodec/dsputil_template.c
+++ b/libavcodec/dsputil_template.c
@@ -97,10 +97,6 @@ static void FUNCC(clear_blocks)(int16_t *blocks)
}
#endif
-#if BIT_DEPTH == 8
-#include "hpel_template.c"
-#endif
-
#define PIXOP2(OPNAME, OP) \
static inline void FUNC(OPNAME ## _no_rnd_pixels8_l2)(uint8_t *dst, \
const uint8_t *src1, \
diff --git a/libavcodec/hpel_template.c b/libavcodec/hpel_template.c
index 6695a65ac0..8315cdd43d 100644
--- a/libavcodec/hpel_template.c
+++ b/libavcodec/hpel_template.c
@@ -21,6 +21,8 @@
#include "pixels.h"
+#include "bit_depth_template.c"
+
#define DEF_HPEL(OPNAME, OP) \
static inline void FUNC(OPNAME ## _pixels8_l2)(uint8_t *dst, \
const uint8_t *src1, \