aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpegdec.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2013-03-10 14:23:52 -0700
committerMichael Niedermayer <michaelni@gmx.at>2013-03-13 03:59:10 +0100
commite0a8f315911ccd12d1e2eeef6a921b942e0063ab (patch)
tree0f92bf29dfbf0d087166a5bf7a510af42f0e4dc0 /libavcodec/mjpegdec.c
parentb42d594c85d4aac34de00f5f0e3634d5a8d90f56 (diff)
downloadffmpeg-e0a8f315911ccd12d1e2eeef6a921b942e0063ab.tar.gz
mjpeg: use hpeldsp instead of dsputil for half-pel functions.
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r--libavcodec/mjpegdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 2f751944da..7a4c78c22b 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -89,6 +89,7 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
avcodec_get_frame_defaults(&s->picture);
s->avctx = avctx;
+ ff_hpeldsp_init(&s->hdsp, avctx->flags);
ff_dsputil_init(&s->dsp, avctx);
ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct);
s->buffer_size = 0;
@@ -992,7 +993,7 @@ static av_always_inline void mjpeg_copy_block(MJpegDecodeContext *s,
int linesize, int lowres)
{
switch (lowres) {
- case 0: s->dsp.put_pixels_tab[1][0](dst, src, linesize, 8);
+ case 0: s->hdsp.put_pixels_tab[1][0](dst, src, linesize, 8);
break;
case 1: copy_block4(dst, src, linesize, linesize, 4);
break;