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/atrac1.c | |
| 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/atrac1.c')
| -rw-r--r-- | libavcodec/atrac1.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index e5b5b10771..d9613ab7de 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -32,6 +32,7 @@ #include <stddef.h> #include <stdio.h> +#include "libavutil/float_dsp.h" #include "avcodec.h" #include "get_bits.h" #include "dsputil.h" @@ -81,7 +82,7 @@ typedef struct { DECLARE_ALIGNED(32, float, high)[512]; float* bands[3]; FFTContext mdct_ctx[3]; - DSPContext dsp; + AVFloatDSPContext fdsp; } AT1Ctx; /** size of the transform in samples in the long mode for each QMF band */ @@ -141,8 +142,8 @@ static int at1_imdct_block(AT1SUCtx* su, AT1Ctx *q) at1_imdct(q, &q->spec[pos], &su->spectrum[0][ref_pos + start_pos], nbits, band_num); /* overlap and window */ - q->dsp.vector_fmul_window(&q->bands[band_num][start_pos], prev_buf, - &su->spectrum[0][ref_pos + start_pos], ff_sine_32, 16); + q->fdsp.vector_fmul_window(&q->bands[band_num][start_pos], prev_buf, + &su->spectrum[0][ref_pos + start_pos], ff_sine_32, 16); prev_buf = &su->spectrum[0][ref_pos+start_pos + 16]; start_pos += block_size; @@ -362,7 +363,7 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx) ff_atrac_generate_tables(); - ff_dsputil_init(&q->dsp, avctx); + avpriv_float_dsp_init(&q->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); q->bands[0] = q->low; q->bands[1] = q->mid; |