From 9fbd14acb889de7f68641c49e792d4acc46f095e Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 21 Dec 2007 12:38:41 +0000
Subject: [PATCH] Fix typo in macro name: WARPER8_16_SQ --> WRAPPER8_16_SQ.
Originally committed as revision 11296 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/dsputil.c | 16 ++++++++--------
libavcodec/dsputil.h | 4 ++--
libavcodec/i386/dsputil_mmx.c | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 4387e60098f..0d4ac92b9bc 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -3752,16 +3752,16 @@ static int ssd_int8_vs_int16_c(const int8_t *pix1, const int16_t *pix2,
return score;
}
-WARPER8_16_SQ(hadamard8_diff8x8_c, hadamard8_diff16_c)
-WARPER8_16_SQ(hadamard8_intra8x8_c, hadamard8_intra16_c)
-WARPER8_16_SQ(dct_sad8x8_c, dct_sad16_c)
+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)
#ifdef CONFIG_GPL
-WARPER8_16_SQ(dct264_sad8x8_c, dct264_sad16_c)
+WRAPPER8_16_SQ(dct264_sad8x8_c, dct264_sad16_c)
#endif
-WARPER8_16_SQ(dct_max8x8_c, dct_max16_c)
-WARPER8_16_SQ(quant_psnr8x8_c, quant_psnr16_c)
-WARPER8_16_SQ(rd8x8_c, rd16_c)
-WARPER8_16_SQ(bit8x8_c, bit16_c)
+WRAPPER8_16_SQ(dct_max8x8_c, dct_max16_c)
+WRAPPER8_16_SQ(quant_psnr8x8_c, quant_psnr16_c)
+WRAPPER8_16_SQ(rd8x8_c, rd16_c)
+WRAPPER8_16_SQ(bit8x8_c, bit16_c)
static void vector_fmul_c(float *dst, const float *src, int len){
int i;
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index b076e60f58d..d541fe0abdf 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -656,13 +656,13 @@ void ff_mdct_calc(MDCTContext *s, FFTSample *out,
const FFTSample *input, FFTSample *tmp);
void ff_mdct_end(MDCTContext *s);
-#define WARPER8_16(name8, name16)\
+#define WRAPPER8_16(name8, name16)\
static int name16(void /*MpegEncContext*/ *s, uint8_t *dst, uint8_t *src, int stride, int h){\
return name8(s, dst , src , stride, h)\
+name8(s, dst+8 , src+8 , stride, h);\
}
-#define WARPER8_16_SQ(name8, name16)\
+#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);\
diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index ad3a978bb90..9be90d9069a 100644
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -1770,7 +1770,7 @@ static int hadamard8_diff_##cpu(void *s, uint8_t *src1, uint8_t *src2, int strid
);\
return sum&0xFFFF;\
}\
-WARPER8_16_SQ(hadamard8_diff_##cpu, hadamard8_diff16_##cpu)
+WRAPPER8_16_SQ(hadamard8_diff_##cpu, hadamard8_diff16_##cpu)
#define HADAMARD8_DIFF_SSE2(cpu) \
static int hadamard8_diff_##cpu(void *s, uint8_t *src1, uint8_t *src2, int stride, int h){\
@@ -1792,7 +1792,7 @@ static int hadamard8_diff_##cpu(void *s, uint8_t *src1, uint8_t *src2, int strid
);\
return sum&0xFFFF;\
}\
-WARPER8_16_SQ(hadamard8_diff_##cpu, hadamard8_diff16_##cpu)
+WRAPPER8_16_SQ(hadamard8_diff_##cpu, hadamard8_diff16_##cpu)
#define MMABS(a,z) MMABS_MMX(a,z)
#define HSUM(a,t,dst) HSUM_MMX(a,t,dst)
--
GitLab