summaryrefslogtreecommitdiff
path: root/libavcodec/huffyuvenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-20 03:50:43 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-20 04:06:04 +0100
commitda0684820a58ce42a5a2953cbce417e06a54be8f (patch)
treec2d468b28cc427bf5f37ab4074d028494ee4cdce /libavcodec/huffyuvenc.c
parentf29cdbe1b59a0d997733b507041e15ec68cef00c (diff)
avcodec/dsputil/huffyuv: move diff int16 and add int16 to dsputil
This also fixes masking the bits Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/huffyuvenc.c')
-rw-r--r--libavcodec/huffyuvenc.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c
index 5fb7d0cea7..2bc95b59e8 100644
--- a/libavcodec/huffyuvenc.c
+++ b/libavcodec/huffyuvenc.c
@@ -38,19 +38,10 @@
static inline void diff_bytes(HYuvContext *s, uint8_t *dst,
const uint8_t *src0, const uint8_t *src1, int w)
{
- int i;
if (s->bps <= 8) {
s->dsp.diff_bytes(dst, src0, src1, w);
} else {
- const uint16_t *src016 = (const uint16_t *)src0;
- const uint16_t *src116 = (const uint16_t *)src1;
- uint16_t *dst16 = ( uint16_t *)dst;
-
- for (i = 0; i < w; i++) {
- dst16[i] = src016[i] - src116[i];
- }
-
- //FIXME optimize
+ s->dsp.diff_int16((uint16_t *)dst, (const uint16_t *)src0, (const uint16_t *)src1, s->n - 1, w);
}
}