diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 23:41:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 23:41:36 +0100 |
| commit | e82b0e612607d652c1519ee31d30272113775679 (patch) | |
| tree | 9e58ce913ebb7fd54257eb67806d5e4351d4a79e /libavcodec/vorbisdec.c | |
| parent | ca6fee7606866a0cb7676b95db4c462500cc8d2d (diff) | |
| parent | ee964145b5d229571e00bf6883a44189d02babe2 (diff) | |
| download | ffmpeg-e82b0e612607d652c1519ee31d30272113775679.tar.gz | |
Merge commit 'ee964145b5d229571e00bf6883a44189d02babe2'
* commit 'ee964145b5d229571e00bf6883a44189d02babe2':
lavc: remove unused traces of fmtconvert usage
Conflicts:
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/atrac3.c
libavcodec/vorbisdec.c
libavcodec/wma.c
libavcodec/wma.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbisdec.c')
| -rw-r--r-- | libavcodec/vorbisdec.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 35eb2be0e1..0fce735d61 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -35,7 +35,6 @@ #include "avcodec.h" #include "get_bits.h" #include "fft.h" -#include "fmtconvert.h" #include "internal.h" #include "vorbis.h" @@ -128,7 +127,6 @@ typedef struct vorbis_context_s { GetBitContext gb; VorbisDSPContext dsp; AVFloatDSPContext *fdsp; - FmtConvertContext fmt_conv; FFTContext mdct[2]; uint8_t first_frame; @@ -1031,7 +1029,6 @@ static av_cold int vorbis_decode_init(AVCodecContext *avctx) vc->avctx = avctx; ff_vorbisdsp_init(&vc->dsp); - ff_fmt_convert_init(&vc->fmt_conv, avctx); avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; |