From 8a37920c9e0e60d69a3884dbff039133ef0cf9da Mon Sep 17 00:00:00 2001 From: Loren Merritt Date: Tue, 29 Jul 2008 14:17:13 +0000 Subject: [PATCH] r14205 broke vorbis float_to_int on ppc Originally committed as revision 14466 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/dsputil.h | 1 + libavcodec/vorbis_dec.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 859993e..6a761ce 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -66,6 +66,7 @@ void ff_vector_fmul_add_add_c(float *dst, const float *src0, const float *src1, void ff_vector_fmul_window_c(float *dst, const float *src0, const float *src1, const float *win, float add_bias, int len); void ff_float_to_int16_c(int16_t *dst, const float *src, long len); +void ff_float_to_int16_interleave_c(int16_t *dst, const float **src, long len, int channels); /* encoding scans */ extern const uint8_t ff_alternate_horizontal_scan[64]; diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c index 0f0c17b..4e74b14 100644 --- a/libavcodec/vorbis_dec.c +++ b/libavcodec/vorbis_dec.c @@ -926,7 +926,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) { vc->avccontext = avccontext; dsputil_init(&vc->dsp, avccontext); - if(vc->dsp.float_to_int16 == ff_float_to_int16_c) { + if(vc->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) { vc->add_bias = 385; vc->exp_bias = 0; } else { -- 2.7.4