diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-01-14 10:33:47 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-06-18 14:07:23 -0700 |
| commit | e74433a8e6fc00c8dbde293c97a3e45384c2c1d9 (patch) | |
| tree | f975b37a58a7c6e62c84c12349610ce6f40ad4d1 /libavcodec/mjpegdec.c | |
| parent | 869fc416f7c78ed4e397e0208acd1545771c0502 (diff) | |
| download | ffmpeg-e74433a8e6fc00c8dbde293c97a3e45384c2c1d9.tar.gz | |
dsputil: Split clear_block*/fill_block* off into a separate context
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index b1192c58c0..cd1e292870 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -35,6 +35,7 @@ #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "avcodec.h" +#include "blockdsp.h" #include "internal.h" #include "mjpeg.h" #include "mjpegdec.h" @@ -92,6 +93,7 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) } s->avctx = avctx; + ff_blockdsp_init(&s->bdsp, 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); @@ -486,7 +488,7 @@ static int decode_dc_progressive(MJpegDecodeContext *s, int16_t *block, int16_t *quant_matrix, int Al) { int val; - s->dsp.clear_block(block); + s->bdsp.clear_block(block); val = mjpeg_decode_dc(s, dc_index); if (val == 0xffff) { av_log(s->avctx, AV_LOG_ERROR, "error dc\n"); @@ -878,7 +880,7 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, reference_data[c] + block_offset, linesize[c], 8); else { - s->dsp.clear_block(s->block); + s->bdsp.clear_block(s->block); if (decode_block(s, s->block, i, s->dc_index[i], s->ac_index[i], s->quant_matrixes[s->quant_index[c]]) < 0) { |