# HG changeset patch # User diego # Date 1198240721 0 # Node ID 558c1fd0ee72bb6521b249a16bf79a6a74194257 # Parent bc22d052c6e5e5dd88235e015b4710ef25f90e6a Fix typo in macro name: WARPER8_16_SQ --> WRAPPER8_16_SQ. diff -r bc22d052c6e5 -r 558c1fd0ee72 dsputil.c --- a/dsputil.c Fri Dec 21 11:50:18 2007 +0000 +++ b/dsputil.c Fri Dec 21 12:38:41 2007 +0000 @@ -3752,16 +3752,16 @@ 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 -r bc22d052c6e5 -r 558c1fd0ee72 dsputil.h --- a/dsputil.h Fri Dec 21 11:50:18 2007 +0000 +++ b/dsputil.h Fri Dec 21 12:38:41 2007 +0000 @@ -656,13 +656,13 @@ 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 -r bc22d052c6e5 -r 558c1fd0ee72 i386/dsputil_mmx.c --- a/i386/dsputil_mmx.c Fri Dec 21 11:50:18 2007 +0000 +++ b/i386/dsputil_mmx.c Fri Dec 21 12:38:41 2007 +0000 @@ -1770,7 +1770,7 @@ );\ 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 @@ );\ 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)