diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 14:38:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 15:22:11 +0200 |
| commit | 581b5f0b9b93969712e73e0ae6324bbd03e85d4e (patch) | |
| tree | d1319dc7744ac67e6ebd3379f11ff6e4a8178dc1 /libavcodec/ljpegenc.c | |
| parent | 909f53f2b285bc7dbe77d4690a03f3d114417297 (diff) | |
| parent | e3fcb14347466095839c2a3c47ebecff02da891e (diff) | |
| download | ffmpeg-581b5f0b9b93969712e73e0ae6324bbd03e85d4e.tar.gz | |
Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'
* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
dsputil: Split off IDCT bits into their own context
Conflicts:
configure
libavcodec/aic.c
libavcodec/arm/Makefile
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/asvdec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dvdec.c
libavcodec/dxva2_mpeg2.c
libavcodec/intrax8.c
libavcodec/mdec.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc_common.h
libavcodec/mpegvideo.c
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ljpegenc.c')
| -rw-r--r-- | libavcodec/ljpegenc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index e2e4c76be1..19ae1517b9 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -35,7 +35,7 @@ #include "libavutil/pixdesc.h" #include "avcodec.h" -#include "dsputil.h" +#include "idctdsp.h" #include "internal.h" #include "mjpegenc_common.h" #include "mpegvideo.h" @@ -43,7 +43,7 @@ #include "mjpegenc.h" typedef struct LJpegEncContext { - DSPContext dsp; + IDCTDSPContext idsp; ScanTable scantable; uint16_t matrix[64]; @@ -294,8 +294,9 @@ static av_cold int ljpeg_encode_init(AVCodecContext *avctx) s->scratch = av_malloc_array(avctx->width + 1, sizeof(*s->scratch)); - ff_dsputil_init(&s->dsp, avctx); - ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct); + ff_idctdsp_init(&s->idsp, avctx); + ff_init_scantable(s->idsp.idct_permutation, &s->scantable, + ff_zigzag_direct); ff_mjpeg_init_hvsample(avctx, s->hsample, s->vsample); |