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/atrac3.c | |
| parent | ca6fee7606866a0cb7676b95db4c462500cc8d2d (diff) | |
| parent | ee964145b5d229571e00bf6883a44189d02babe2 (diff) | |
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/atrac3.c')
| -rw-r--r-- | libavcodec/atrac3.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 9dc0811dab..5aa3d8df1a 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -42,7 +42,6 @@ #include "avcodec.h" #include "bytestream.h" #include "fft.h" -#include "fmtconvert.h" #include "get_bits.h" #include "internal.h" @@ -108,7 +107,6 @@ typedef struct ATRAC3Context { AtracGCContext gainc_ctx; FFTContext mdct_ctx; - FmtConvertContext fmt_conv; AVFloatDSPContext *fdsp; } ATRAC3Context; @@ -917,7 +915,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) ff_atrac_init_gain_compensation(&q->gainc_ctx, 4, 3); q->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT); - ff_fmt_convert_init(&q->fmt_conv, avctx); q->units = av_mallocz_array(avctx->channels, sizeof(*q->units)); if (!q->units || !q->fdsp) { |