From d3c3c1664a958923f234283e66fbcbfe69a6927f Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 8 Jan 2014 00:06:52 +0100
Subject: [PATCH] dsputil: Move hpel_template #include out of dsputil_template
Multiple inclusion makes no sense as it is only used in the 8-bit case.
---
libavcodec/dsputil.c | 1 +
libavcodec/dsputil_template.c | 4 ----
libavcodec/hpel_template.c | 2 ++
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index b81ba47521e..e41ea86e096 100644
--- 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"
diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c
index 56f41ad767b..c2b30d2b1e1 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 0a8550a738d..fa7a614b823 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, \
--
GitLab