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/wma.h | |
| 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/wma.h')
| -rw-r--r-- | libavcodec/wma.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/wma.h b/libavcodec/wma.h index 8d337df1dd..b776c5338a 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -25,7 +25,6 @@ #include "libavutil/float_dsp.h" #include "fft.h" -#include "fmtconvert.h" #include "get_bits.h" #include "put_bits.h" @@ -131,7 +130,6 @@ typedef struct WMACodecContext { float lsp_pow_e_table[256]; float lsp_pow_m_table1[(1 << LSP_POW_BITS)]; float lsp_pow_m_table2[(1 << LSP_POW_BITS)]; - FmtConvertContext fmt_conv; AVFloatDSPContext *fdsp; #ifdef TRACE |