diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-30 03:01:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-30 03:09:08 +0200 |
| commit | 445fdc014017a236fa7aa2645ffad7e8d0b45bee (patch) | |
| tree | 1bd6be8b1dbf95535926c0e1348c63027ecb4339 /libavcodec/ac3dec.h | |
| parent | 55ce3c67bb25cd44889f2143ce9fd7dac3ab4a9d (diff) | |
| parent | 52fd16a264d1eb14b1a84b7b38041da1756fb216 (diff) | |
| download | ffmpeg-445fdc014017a236fa7aa2645ffad7e8d0b45bee.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: move compute_mantissa_size() to ac3dsp
ac3enc: move mant*_cnt and qmant*_ptr out of AC3EncodeContext
Remove support for stripping executables
ac3enc: NEON optimised float_to_fixed24
ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp
dfa: protect pointer range checks against overflows.
Duplicate: mimic: implement multithreading.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3dec.h')
| -rw-r--r-- | libavcodec/ac3dec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h index 73044d3f7c..e569295a50 100644 --- a/libavcodec/ac3dec.h +++ b/libavcodec/ac3dec.h @@ -52,6 +52,7 @@ #include "libavutil/lfg.h" #include "ac3.h" +#include "ac3dsp.h" #include "get_bits.h" #include "dsputil.h" #include "fft.h" @@ -192,6 +193,7 @@ typedef struct { ///@defgroup opt optimization DSPContext dsp; ///< for optimization + AC3DSPContext ac3dsp; FmtConvertContext fmt_conv; ///< optimized conversion functions float mul_bias; ///< scaling for float_to_int16 conversion ///@} |