diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 17:07:51 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 17:13:16 +0400 |
| commit | c62cb1112ffc32492c99aa1e94324fc6a951abe9 (patch) | |
| tree | 4ed9a1feb6ea8db5b431487e6618d1015e84eb9a /libavcodec/vorbisdec.c | |
| parent | cf061a9c3b861a048dd5b67ded5265c6f53805e5 (diff) | |
| parent | fef906c77c09940a2fdad155b2adc05080e17eda (diff) | |
Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'
* commit 'fef906c77c09940a2fdad155b2adc05080e17eda':
Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.
Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 8718f86c1c..b05f8f54be 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -34,12 +34,12 @@ #include "libavutil/avassert.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 @@ -127,7 +127,7 @@ typedef struct vorbis_context_s { AVCodecContext *avccontext; AVFrame frame; GetBitContext gb; - DSPContext dsp; + VorbisDSPContext dsp; AVFloatDSPContext fdsp; FmtConvertContext fmt_conv; @@ -991,7 +991,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); |