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/aacdec.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/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 38796006e8..9fafeaef50 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -88,7 +88,6 @@ #include "get_bits.h" #include "fft.h" #include "imdct15.h" -#include "fmtconvert.h" #include "lpc.h" #include "kbdwin.h" #include "sinewin.h" @@ -1133,7 +1132,6 @@ static av_cold int aac_decode_init(AVCodecContext *avctx) ff_aac_sbr_init(); - ff_fmt_convert_init(&ac->fmt_conv, avctx); ac->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT); if (!ac->fdsp) { return AVERROR(ENOMEM); |