summaryrefslogtreecommitdiff
path: root/libavcodec/huffyuvdec.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-01-08 11:48:05 -0300
committerJames Almer <jamrial@gmail.com>2017-01-12 22:53:05 -0300
commit47f212329e5d73c81e2c67acd6a481bc0fe687b2 (patch)
tree5457e6f0cad40c63b67f86331659f880b4e576b8 /libavcodec/huffyuvdec.c
parentcf9ef839606dd50f779c395d8a277de143f7e5b2 (diff)
huffyuvdsp: move functions only used by huffyuv from lossless_videodsp
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/huffyuvdec.c')
-rw-r--r--libavcodec/huffyuvdec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index d0682040b3..c79dda4c90 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -297,8 +297,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (ret < 0)
return ret;
- ff_huffyuvdsp_init(&s->hdsp);
- ff_llviddsp_init(&s->llviddsp, avctx);
+ ff_huffyuvdsp_init(&s->hdsp, avctx);
+ ff_llviddsp_init(&s->llviddsp);
memset(s->vlc, 0, 4 * sizeof(VLC));
s->interlaced = avctx->height > 288;
@@ -891,7 +891,7 @@ static void add_bytes(HYuvContext *s, uint8_t *dst, uint8_t *src, int w)
if (s->bps <= 8) {
s->llviddsp.add_bytes(dst, src, w);
} else {
- s->llviddsp.add_int16((uint16_t*)dst, (const uint16_t*)src, s->n - 1, w);
+ s->hdsp.add_int16((uint16_t*)dst, (const uint16_t*)src, s->n - 1, w);
}
}
@@ -900,7 +900,7 @@ static void add_median_prediction(HYuvContext *s, uint8_t *dst, const uint8_t *s
if (s->bps <= 8) {
s->llviddsp.add_median_pred(dst, src, diff, w, left, left_top);
} else {
- s->llviddsp.add_hfyu_median_pred_int16((uint16_t *)dst, (const uint16_t *)src, (const uint16_t *)diff, s->n-1, w, left, left_top);
+ s->hdsp.add_hfyu_median_pred_int16((uint16_t *)dst, (const uint16_t *)src, (const uint16_t *)diff, s->n-1, w, left, left_top);
}
}
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,