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/dvdec.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/dvdec.c')
| -rw-r--r-- | libavcodec/dvdec.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index bf8b5b57e2..fd61320f8e 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -40,6 +40,7 @@ #include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" #include "avcodec.h" +#include "idctdsp.h" #include "internal.h" #include "get_bits.h" #include "put_bits.h" @@ -62,24 +63,24 @@ static const int dv_iweight_bits = 14; static av_cold int dvvideo_decode_init(AVCodecContext *avctx) { DVVideoContext *s = avctx->priv_data; - DSPContext dsp; + IDCTDSPContext idsp; int i; - memset(&dsp,0, sizeof(dsp)); - ff_dsputil_init(&dsp, avctx); + memset(&idsp,0, sizeof(idsp)); + ff_idctdsp_init(&idsp, avctx); for (i = 0; i < 64; i++) - s->dv_zigzag[0][i] = dsp.idct_permutation[ff_zigzag_direct[i]]; + s->dv_zigzag[0][i] = idsp.idct_permutation[ff_zigzag_direct[i]]; if (avctx->lowres){ for (i = 0; i < 64; i++){ int j = ff_dv_zigzag248_direct[i]; - s->dv_zigzag[1][i] = dsp.idct_permutation[(j & 7) + (j & 8) * 4 + (j & 48) / 2]; + s->dv_zigzag[1][i] = idsp.idct_permutation[(j & 7) + (j & 8) * 4 + (j & 48) / 2]; } }else memcpy(s->dv_zigzag[1], ff_dv_zigzag248_direct, sizeof(s->dv_zigzag[1])); - s->idct_put[0] = dsp.idct_put; + s->idct_put[0] = idsp.idct_put; s->idct_put[1] = ff_simple_idct248_put; return ff_dvvideo_init(avctx); |