dsputil: Move hpel_template #include out of dsputil_template

Multiple inclusion makes no sense as it is only used in the 8-bit case.
11 years ago · d3c3c1664a
parent d0aabeab23
commit d3c3c1664a
3 changed files with 3 additions and 4 deletions
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@ -48,6 +48,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"

--- 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, \
--- 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,     \