[FFmpeg-cvslog] r14466 - in trunk/libavcodec: dsputil.h vorbis_dec.c

lorenm subversion
Tue Jul 29 16:17:14 CEST 2008


Author: lorenm
Date: Tue Jul 29 16:17:13 2008
New Revision: 14466

Log:
r14205 broke vorbis float_to_int on ppc


Modified:
   trunk/libavcodec/dsputil.h
   trunk/libavcodec/vorbis_dec.c

Modified: trunk/libavcodec/dsputil.h
==============================================================================
--- trunk/libavcodec/dsputil.h	(original)
+++ trunk/libavcodec/dsputil.h	Tue Jul 29 16:17:13 2008
@@ -66,6 +66,7 @@ void ff_vector_fmul_add_add_c(float *dst
 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];

Modified: trunk/libavcodec/vorbis_dec.c
==============================================================================
--- trunk/libavcodec/vorbis_dec.c	(original)
+++ trunk/libavcodec/vorbis_dec.c	Tue Jul 29 16:17:13 2008
@@ -926,7 +926,7 @@ static av_cold int vorbis_decode_init(AV
     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 {




More information about the ffmpeg-cvslog mailing list