diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 02:01:45 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 02:01:45 +0400 |
| commit | ea0931fb962f2436695606a8ef9a4811e4970e22 (patch) | |
| tree | b7e21eae75f3345b7c0d71855e7e611f1eca4f54 /libavcodec/dsputil.c | |
| parent | cb8763bda7e5e59064193e6b29b0f806560f66d3 (diff) | |
| parent | 65d5d5865845f057cc6530a8d0f34db952d9009c (diff) | |
Merge commit '65d5d5865845f057cc6530a8d0f34db952d9009c'
* commit '65d5d5865845f057cc6530a8d0f34db952d9009c':
dsputil: Move SVQ1 encoding specific bits into svq1enc
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 8621e95806..64bea69219 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2216,16 +2216,6 @@ static int vsse16_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, return score; } -static int ssd_int8_vs_int16_c(const int8_t *pix1, const int16_t *pix2, - int size) -{ - int score = 0, i; - - for (i = 0; i < size; i++) - score += (pix1[i] - pix2[i]) * (pix1[i] - pix2[i]); - return score; -} - #define WRAPPER8_16_SQ(name8, name16) \ static int name16(MpegEncContext *s, uint8_t *dst, uint8_t *src, \ int stride, int h) \ @@ -2626,8 +2616,6 @@ av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx) ff_dsputil_init_dwt(c); #endif - c->ssd_int8_vs_int16 = ssd_int8_vs_int16_c; - c->bswap_buf = bswap_buf; c->bswap16_buf = bswap16_buf; |