diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-01-24 11:55:16 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-06-30 07:58:46 -0700 |
| commit | e3fcb14347466095839c2a3c47ebecff02da891e (patch) | |
| tree | 38fbcef2c592faae3610887dbda3ab333181d1dc /libavcodec/g2meet.c | |
| parent | adcb8392c9b185fd8a91a95fa256d15ab1432a30 (diff) | |
dsputil: Split off IDCT bits into their own context
Diffstat (limited to 'libavcodec/g2meet.c')
| -rw-r--r-- | libavcodec/g2meet.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 9660155619..456045dbc2 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -31,7 +31,7 @@ #include "avcodec.h" #include "blockdsp.h" #include "bytestream.h" -#include "dsputil.h" +#include "idctdsp.h" #include "get_bits.h" #include "internal.h" #include "mjpeg.h" @@ -74,7 +74,7 @@ static const uint8_t chroma_quant[64] = { typedef struct JPGContext { BlockDSPContext bdsp; - DSPContext dsp; + IDCTDSPContext idsp; ScanTable scantable; VLC dc_vlc[2], ac_vlc[2]; @@ -153,8 +153,8 @@ static av_cold int jpg_init(AVCodecContext *avctx, JPGContext *c) return ret; ff_blockdsp_init(&c->bdsp, avctx); - ff_dsputil_init(&c->dsp, avctx); - ff_init_scantable(c->dsp.idct_permutation, &c->scantable, + ff_idctdsp_init(&c->idsp, avctx); + ff_init_scantable(c->idsp.idct_permutation, &c->scantable, ff_zigzag_direct); return 0; @@ -279,13 +279,13 @@ static int jpg_decode_data(JPGContext *c, int width, int height, if ((ret = jpg_decode_block(c, &gb, 0, c->block[i + j * 2])) != 0) return ret; - c->dsp.idct(c->block[i + j * 2]); + c->idsp.idct(c->block[i + j * 2]); } } for (i = 1; i < 3; i++) { if ((ret = jpg_decode_block(c, &gb, i, c->block[i + 3])) != 0) return ret; - c->dsp.idct(c->block[i + 3]); + c->idsp.idct(c->block[i + 3]); } for (j = 0; j < 16; j++) { |