diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:04:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:04:50 +0100 |
| commit | 6e6e1708984e45881b9a5d4e26c3e7de852c54d5 (patch) | |
| tree | 5e04d38f8e152faf98921843ca5e4530cbdc46a4 /libavcodec/aacenc.h | |
| parent | b1b870fbd7185bffbe27c5918001b40a8ff8b920 (diff) | |
| parent | 42d324694883cdf1fff1612ac70fa403692a1ad4 (diff) | |
Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'
* commit '42d324694883cdf1fff1612ac70fa403692a1ad4':
floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.
Conflicts:
libavcodec/arm/dsputil_init_vfp.c
libavcodec/arm/dsputil_vfp.S
libavcodec/dsputil.c
libavcodec/ppc/float_altivec.c
libavcodec/x86/dsputil.asm
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacenc.h')
| -rw-r--r-- | libavcodec/aacenc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index fbc3da8879..a2fd351e63 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -61,7 +61,6 @@ typedef struct AACEncContext { PutBitContext pb; FFTContext mdct1024; ///< long (1024 samples) frame transform context FFTContext mdct128; ///< short (128 samples) frame transform context - DSPContext dsp; AVFloatDSPContext fdsp; float *planar_samples[6]; ///< saved preprocessed input |