diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-19 22:21:10 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-19 22:21:10 -0800 |
| commit | fef906c77c09940a2fdad155b2adc05080e17eda (patch) | |
| tree | 04fe0b67be6917b07bfb94a6af45b669f3a66107 /libavcodec/vorbisdec.c | |
| parent | aeaf268e52fc11c1f64914a319e0edddf1346d6a (diff) | |
| download | ffmpeg-fef906c77c09940a2fdad155b2adc05080e17eda.tar.gz | |
Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.
Conveniently (together with Justin's earlier patches), this makes
our vorbis decoder entirely independent of dsputil.
Diffstat (limited to 'libavcodec/vorbisdec.c')
| -rw-r--r-- | libavcodec/vorbisdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 9bea908cc1..6b75ae393a 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -29,12 +29,12 @@ #include "libavutil/float_dsp.h" #include "avcodec.h" #include "get_bits.h" -#include "dsputil.h" #include "fft.h" #include "fmtconvert.h" #include "internal.h" #include "vorbis.h" +#include "vorbisdsp.h" #include "xiph.h" #define V_NB_BITS 8 @@ -125,7 +125,7 @@ typedef struct vorbis_context_s { AVCodecContext *avccontext; AVFrame frame; GetBitContext gb; - DSPContext dsp; + VorbisDSPContext dsp; AVFloatDSPContext fdsp; FmtConvertContext fmt_conv; @@ -981,7 +981,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) int hdr_type, ret; vc->avccontext = avccontext; - ff_dsputil_init(&vc->dsp, avccontext); + ff_vorbisdsp_init(&vc->dsp); avpriv_float_dsp_init(&vc->fdsp, avccontext->flags & CODEC_FLAG_BITEXACT); ff_fmt_convert_init(&vc->fmt_conv, avccontext); |