diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 14:27:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 14:27:44 +0100 |
| commit | 276c9c0577e99c870d4d281bc8f0df82b402efc4 (patch) | |
| tree | 98afdf91d6b38464087ceeec7cf3c0bdb4667ba9 /libavcodec | |
| parent | 5fd6d85d17d567684da0399388ae411b52ce059f (diff) | |
| parent | 059866eb17cd3c66422a61d3e9c3305f55830a50 (diff) | |
| download | ffmpeg-276c9c0577e99c870d4d281bc8f0df82b402efc4.tar.gz | |
Merge commit '059866eb17cd3c66422a61d3e9c3305f55830a50'
* commit '059866eb17cd3c66422a61d3e9c3305f55830a50':
dsputil: Move WRAPPER8_16_SQ macro to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dsputil.c | 14 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 5f7d6360c7..518abae319 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2438,6 +2438,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 e5f0e31f25..4c806d17e3 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -462,18 +462,4 @@ void ff_dsputil_init_dwt(DSPContext *c); # 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 */ |