repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
ac3dec.c
diff --git
a/ffmpeg/libavcodec/ac3dec.c
b/ffmpeg/libavcodec/ac3dec.c
index 969e37ffb848a32967b33c619c37ef032c22722c..d3e8713e0319c7ef88b4528ca6b7d94ab128e5f0 100644
(file)
--- a/
ffmpeg/libavcodec/ac3dec.c
+++ b/
ffmpeg/libavcodec/ac3dec.c
@@
-195,7
+195,7
@@
static av_cold int ac3_decode_init(AVCodecContext *avctx)
#if (USE_FIXED)
s->fdsp = avpriv_alloc_fixed_dsp(avctx->flags & CODEC_FLAG_BITEXACT);
#else
#if (USE_FIXED)
s->fdsp = avpriv_alloc_fixed_dsp(avctx->flags & CODEC_FLAG_BITEXACT);
#else
-
avpriv_float_dsp_init(&s->fdsp,
avctx->flags & CODEC_FLAG_BITEXACT);
+
s->fdsp = avpriv_float_dsp_alloc(
avctx->flags & CODEC_FLAG_BITEXACT);
#endif
ff_ac3dsp_init(&s->ac3dsp, avctx->flags & CODEC_FLAG_BITEXACT);
#endif
ff_ac3dsp_init(&s->ac3dsp, avctx->flags & CODEC_FLAG_BITEXACT);
@@
-688,7
+688,7
@@
static inline void do_imdct(AC3DecodeContext *s, int channels)
s->fdsp->vector_fmul_window_scaled(s->outptr[ch - 1], s->delay[ch - 1],
s->tmp_output, s->window, 128, 8);
#else
s->fdsp->vector_fmul_window_scaled(s->outptr[ch - 1], s->delay[ch - 1],
s->tmp_output, s->window, 128, 8);
#else
- s->fdsp
.
vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1],
+ s->fdsp
->
vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1],
s->tmp_output, s->window, 128);
#endif
for (i = 0; i < 128; i++)
s->tmp_output, s->window, 128);
#endif
for (i = 0; i < 128; i++)
@@
-700,7
+700,7
@@
static inline void do_imdct(AC3DecodeContext *s, int channels)
s->fdsp->vector_fmul_window_scaled(s->outptr[ch - 1], s->delay[ch - 1],
s->tmp_output, s->window, 128, 8);
#else
s->fdsp->vector_fmul_window_scaled(s->outptr[ch - 1], s->delay[ch - 1],
s->tmp_output, s->window, 128, 8);
#else
- s->fdsp
.
vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1],
+ s->fdsp
->
vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1],
s->tmp_output, s->window, 128);
#endif
memcpy(s->delay[ch - 1], s->tmp_output + 128, 128 * sizeof(FFTSample));
s->tmp_output, s->window, 128);
#endif
memcpy(s->delay[ch - 1], s->tmp_output + 128, 128 * sizeof(FFTSample));
@@
-1635,9
+1635,7
@@
static av_cold int ac3_decode_end(AVCodecContext *avctx)
AC3DecodeContext *s = avctx->priv_data;
ff_mdct_end(&s->imdct_512);
ff_mdct_end(&s->imdct_256);
AC3DecodeContext *s = avctx->priv_data;
ff_mdct_end(&s->imdct_512);
ff_mdct_end(&s->imdct_256);
-#if (USE_FIXED)
av_freep(&s->fdsp);
av_freep(&s->fdsp);
-#endif
return 0;
}
return 0;
}