snow altivec is broken

[ffmpeg] / libavcodec / cook.c

diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index ded5d961850ac06672f63be0123ed593553c4363..43b661d18657954e296003b81fd0c97da8995f3b 100644 (file)
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -270,7 +270,7 @@ static float *maybe_reformat_buffer32 (COOKContext *q, float *ptr, int n)
         return ptr;
 }
 
-static int init_cplscales_table (COOKContext *q) {
+static void init_cplscales_table (COOKContext *q) {
     int i;
     for (i=0;i<5;i++)
         q->cplscales[i] = maybe_reformat_buffer32 (q, cplscales[i], (1<<(i+2))-1);
@@ -283,7 +283,7 @@ static int init_cplscales_table (COOKContext *q) {
  * Why? No idea, some checksum/error detection method maybe.
  *
  * Out buffer size: extra bytes are needed to cope with
- * padding/missalignment.
+ * padding/misalignment.
  * Subpackets passed to the decoder can contain two, consecutive
  * half-subpackets, of identical but arbitrary size.
  *          1234 1234 1234 1234  extraA extraB
@@ -538,7 +538,7 @@ static inline void expand_category(COOKContext *q, int* category,
  * @param mlt_p                 pointer into the mlt buffer
  */
 
-static void scalar_dequant(COOKContext *q, int index, int quant_index,
+static void scalar_dequant_float(COOKContext *q, int index, int quant_index,
                            int* subband_coef_index, int* subband_coef_sign,
                            float* mlt_p){
     int i;
@@ -677,7 +677,7 @@ static void mono_decode(COOKContext *q, float* mlt_buffer) {
  * @param gain_index_next   index for the next block multiplier
  */
 
-static void interpolate(COOKContext *q, float* buffer,
+static void interpolate_float(COOKContext *q, float* buffer,
                         int gain_index, int gain_index_next){
     int i;
     float fc1, fc2;
@@ -830,7 +830,7 @@ static void joint_decode(COOKContext *q, float* mlt_buffer1,
     int i,j;
     int decouple_tab[SUBBAND_SIZE];
     float *decode_buffer = q->decode_buffer_0;
-    int idx, cpl_tmp,tmp_idx;
+    int idx, cpl_tmp;
     float f1,f2;
     float* cplscale;
 
@@ -906,7 +906,7 @@ saturate_output_float (COOKContext *q, int chan, int16_t *out)
      */
     for (j = 0; j < q->samples_per_channel; j++) {
         out[chan + q->nb_channels * j] =
-          av_clip(lrintf(output[j]), -32768, 32767);
+          av_clip_int16(lrintf(output[j]));
     }
 }
 
@@ -1164,10 +1164,10 @@ static int cook_decode_init(AVCodecContext *avctx)
 
     /* Initialize COOK signal arithmetic handling */
     if (1) {
-        q->scalar_dequant  = scalar_dequant;
+        q->scalar_dequant  = scalar_dequant_float;
         q->decouple        = decouple_float;
         q->imlt_window     = imlt_window_float;
-        q->interpolate     = interpolate;
+        q->interpolate     = interpolate_float;
         q->saturate_output = saturate_output_float;
     }