dsputil: Move hpel_template #include out of dsputil_template
authorDiego Biurrun <diego@biurrun.de>
Tue, 7 Jan 2014 23:06:52 +0000 (00:06 +0100)
committerDiego Biurrun <diego@biurrun.de>
Wed, 26 Mar 2014 11:31:26 +0000 (04:31 -0700)
Multiple inclusion makes no sense as it is only used in the 8-bit case.

libavcodec/dsputil.c
libavcodec/dsputil_template.c
libavcodec/hpel_template.c

index b81ba47..e41ea86 100644 (file)
@@ -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"
 
index 56f41ad..c2b30d2 100644 (file)
@@ -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, \
index 0a8550a..fa7a614 100644 (file)
@@ -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,     \