diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-22 19:58:28 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-22 19:58:28 +0400 |
commit | 99497b4683e5054bcdc5b6802a27d717df9e04f3 (patch) | |
tree | 130022374c1a92b72288272bd0927ae6ac7d825b /libavcodec/ac3enc_fixed.c | |
parent | 0dae193d3ecf5d0dc687f5ad708419bf7600de9a (diff) | |
parent | 9a9e2f1c8aa4539a261625145e5c1f46a8106ac2 (diff) |
Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'
* commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2':
dsputil: Split audio operations off into a separate context
Conflicts:
configure
libavcodec/takdec.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc_fixed.c')
-rw-r--r-- | libavcodec/ac3enc_fixed.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index 3994c17d3b..9d39026dd5 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -29,6 +29,7 @@ #define FFT_FLOAT 0 #undef CONFIG_AC3ENC_FLOAT #include "internal.h" +#include "audiodsp.h" #include "ac3enc.h" #include "eac3enc.h" @@ -111,9 +112,10 @@ static void sum_square_butterfly(AC3EncodeContext *s, int64_t sum[4], /* * Clip MDCT coefficients to allowable range. */ -static void clip_coefficients(DSPContext *dsp, int32_t *coef, unsigned int len) +static void clip_coefficients(AudioDSPContext *adsp, int32_t *coef, + unsigned int len) { - dsp->vector_clip_int32(coef, coef, COEF_MIN, COEF_MAX, len); + adsp->vector_clip_int32(coef, coef, COEF_MIN, COEF_MAX, len); } |