diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:31:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:31:55 +0100 |
| commit | 8102f27b5b3dff54f8099019c2df4701ac5e5d4f (patch) | |
| tree | f623e5063c24e6c4afc50338dfeecf7054c673a2 /libavcodec/ra288.c | |
| parent | 24604ebaf85b5436d10da811f455dd710b353aca (diff) | |
| parent | 73b704ac609d83e0be124589f24efd9b94947cf9 (diff) | |
| download | ffmpeg-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/ra288.c')
| -rw-r--r-- | libavcodec/ra288.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index 7f0e2f71a8..8bafc010e1 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -84,7 +84,7 @@ static av_cold int ra288_decode_init(AVCodecContext *avctx) static void convolve(float *tgt, const float *src, int len, int n) { for (; n >= 0; n--) - tgt[n] = ff_scalarproduct_float_c(src, src - n, len); + tgt[n] = avpriv_scalarproduct_float_c(src, src - n, len); } @@ -113,7 +113,7 @@ static void decode(RA288Context *ractx, float gain, int cb_coef) for (i=0; i < 5; i++) buffer[i] = codetable[cb_coef][i] * sumsum; - sum = ff_scalarproduct_float_c(buffer, buffer, 5); + sum = avpriv_scalarproduct_float_c(buffer, buffer, 5); sum = FFMAX(sum, 5. / (1<<24)); |