diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:38:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:38:41 +0100 |
| commit | 5c7e9e16c961f1f7258734426afac3cee4349580 (patch) | |
| tree | 20ea7bec723ef262bffb8f2447adcc1dc3d98069 /libavcodec/ac3dec.h | |
| parent | 0e79fe37e5c5500db2e65ce6b7ea0bbdb3f24665 (diff) | |
| parent | e034cc6c60c77dce390b1ac31141b1862bdf8999 (diff) | |
| download | ffmpeg-5c7e9e16c961f1f7258734426afac3cee4349580.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: Move vector_fmul_window to AVFloatDSPContext
rtpdec_mpeg4: Check the remaining amount of data before reading
Conflicts:
libavcodec/dsputil.c
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 18640dd6d9..a0213339bd 100644 --- a/libavcodec/ac3dec.h +++ b/libavcodec/ac3dec.h @@ -50,6 +50,7 @@ #ifndef AVCODEC_AC3DEC_H #define AVCODEC_AC3DEC_H +#include "libavutil/float_dsp.h" #include "libavutil/lfg.h" #include "ac3.h" #include "ac3dsp.h" @@ -199,6 +200,7 @@ typedef struct AC3DecodeContext { ///@name Optimization DSPContext dsp; ///< for optimization + AVFloatDSPContext fdsp; AC3DSPContext ac3dsp; FmtConvertContext fmt_conv; ///< optimized conversion functions ///@} |