Browse Source

Fix typo in macro name: WARPER8_16_SQ --> WRAPPER8_16_SQ.

Originally committed as revision 11296 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Diego Biurrun 17 years ago
parent
commit
9fbd14acb8
3 changed files with 12 additions and 12 deletions
  1. +8
    -8
      libavcodec/dsputil.c
  2. +2
    -2
      libavcodec/dsputil.h
  3. +2
    -2
      libavcodec/i386/dsputil_mmx.c

+ 8
- 8
libavcodec/dsputil.c View File

@@ -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;


+ 2
- 2
libavcodec/dsputil.h View File

@@ -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);\


+ 2
- 2
libavcodec/i386/dsputil_mmx.c View File

@@ -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)


Loading…
Cancel
Save