From 059866eb17cd3c66422a61d3e9c3305f55830a50 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 7 Feb 2013 22:39:26 +0100
Subject: [PATCH] dsputil: Move WRAPPER8_16_SQ macro to the only place it is
 used

---
 libavcodec/dsputil.c | 14 ++++++++++++++
 libavcodec/dsputil.h | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 9015d9dd65..3b88164b2e 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2315,6 +2315,20 @@ static int ssd_int8_vs_int16_c(const int8_t *pix1, const int16_t *pix2,
     return score;
 }
 
+#define WRAPPER8_16_SQ(name8, name16)\
+static int name16(void /*MpegEncContext*/ *s, uint8_t *dst, uint8_t *src, int stride, int h){\
+    int score=0;\
+    score +=name8(s, dst           , src           , stride, 8);\
+    score +=name8(s, dst+8         , src+8         , stride, 8);\
+    if(h==16){\
+        dst += 8*stride;\
+        src += 8*stride;\
+        score +=name8(s, dst           , src           , stride, 8);\
+        score +=name8(s, dst+8         , src+8         , stride, 8);\
+    }\
+    return score;\
+}
+
 WRAPPER8_16_SQ(hadamard8_diff8x8_c, hadamard8_diff16_c)
 WRAPPER8_16_SQ(hadamard8_intra8x8_c, hadamard8_intra16_c)
 WRAPPER8_16_SQ(dct_sad8x8_c, dct_sad16_c)
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 70e2489d32..e4568ab453 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -443,18 +443,4 @@ void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
 #   define LOCAL_ALIGNED_16(t, v, ...) LOCAL_ALIGNED(16, t, v, __VA_ARGS__)
 #endif
 
-#define WRAPPER8_16_SQ(name8, name16)\
-static int name16(void /*MpegEncContext*/ *s, uint8_t *dst, uint8_t *src, int stride, int h){\
-    int score=0;\
-    score +=name8(s, dst           , src           , stride, 8);\
-    score +=name8(s, dst+8         , src+8         , stride, 8);\
-    if(h==16){\
-        dst += 8*stride;\
-        src += 8*stride;\
-        score +=name8(s, dst           , src           , stride, 8);\
-        score +=name8(s, dst+8         , src+8         , stride, 8);\
-    }\
-    return score;\
-}
-
 #endif /* AVCODEC_DSPUTIL_H */