Commit 8a37920c authored by Loren Merritt's avatar Loren Merritt

r14205 broke vorbis float_to_int on ppc

Originally committed as revision 14466 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c16184e9
...@@ -66,6 +66,7 @@ void ff_vector_fmul_add_add_c(float *dst, const float *src0, const float *src1, ...@@ -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, void ff_vector_fmul_window_c(float *dst, const float *src0, const float *src1,
const float *win, float add_bias, int len); 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_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 */ /* encoding scans */
extern const uint8_t ff_alternate_horizontal_scan[64]; extern const uint8_t ff_alternate_horizontal_scan[64];
......
...@@ -926,7 +926,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) { ...@@ -926,7 +926,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) {
vc->avccontext = avccontext; vc->avccontext = avccontext;
dsputil_init(&vc->dsp, 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->add_bias = 385;
vc->exp_bias = 0; vc->exp_bias = 0;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment