---
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 a48a371..dea7029 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2316,6 +2316,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 ff9edc9..c3afbbc 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -429,18 +429,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 */
--
1.7.9.5
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
