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/aac.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/aac.h')
| -rw-r--r-- | libavcodec/aac.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 3d0caedc63..e9c373fc34 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -36,7 +36,6 @@ #include "fft.h" #include "mpeg4audio.h" #include "sbr.h" -#include "fmtconvert.h" #include <stdint.h> @@ -296,7 +295,6 @@ struct AACContext { FFTContext mdct_ld; FFTContext mdct_ltp; IMDCT15Context *mdct480; - FmtConvertContext fmt_conv; AVFloatDSPContext *fdsp; int random_state; /** @} */ |