aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aac.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-23 14:31:55 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-23 14:31:55 +0100
commit8102f27b5b3dff54f8099019c2df4701ac5e5d4f (patch)
treef623e5063c24e6c4afc50338dfeecf7054c673a2 /libavcodec/aac.h
parent24604ebaf85b5436d10da811f455dd710b353aca (diff)
parent73b704ac609d83e0be124589f24efd9b94947cf9 (diff)
downloadffmpeg-8102f27b5b3dff54f8099019c2df4701ac5e5d4f.tar.gz
Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'
* commit '73b704ac609d83e0be124589f24efd9b94947cf9': arm: Add some missing header #includes floatdsp: move scalarproduct_float from dsputil to avfloatdsp. Conflicts: libavcodec/acelp_pitch_delay.c libavcodec/amrnbdec.c libavcodec/amrwbdec.c libavcodec/ra288.c libavcodec/x86/dsputil_mmx.c libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac.h')
-rw-r--r--libavcodec/aac.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index 9e9fa0ea64..5b98856e67 100644
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -292,7 +292,6 @@ typedef struct AACContext {
FFTContext mdct;
FFTContext mdct_small;
FFTContext mdct_ltp;
- DSPContext dsp;
FmtConvertContext fmt_conv;
AVFloatDSPContext fdsp;
int random_state;