Fix crash with illegal instruction, cmov is available on 686 and later only.

[ffmpeg] / libavcodec / resample2.c

diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c
index 4c04c3edea77886f3f1cec1883c49eaa8bd5eaac..3ae0ba855c5bac6367860a7d9f56c2b7377e4fd2 100644 (file)
--- a/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@@ -2,22 +2,24 @@
  * audio resampling
  * Copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at>
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  */
- 
+
 /**
  * @file resample2.c
  * audio resampling
@@ -62,11 +64,11 @@ typedef struct AVResampleContext{
 /**
  * 0th order modified bessel function of the first kind.
  */
-double bessel(double x){
+static double bessel(double x){
     double v=1;
     double t=1;
     int i;
-    
+
     for(i=1; i<50; i++){
         t *= i;
         v += pow(x*x/4, i)/(t*t);
@@ -134,7 +136,7 @@ AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size,
     AVResampleContext *c= av_mallocz(sizeof(AVResampleContext));
     double factor= FFMIN(out_rate * cutoff / in_rate, 1.0);
     int phase_count= 1<<phase_shift;
-    
+
     c->phase_shift= phase_shift;
     c->phase_mask= phase_count-1;
     c->linear= linear;
@@ -166,7 +168,7 @@ void av_resample_close(AVResampleContext *c){
  * example: av_resample_compensate(c, 10, 500)
  * here instead of 510 samples only 500 samples would be output
  *
- * note, due to rounding the actual compensation might be slightly different, 
+ * note, due to rounding the actual compensation might be slightly different,
  * especially if the compensation_distance is large and the in_rate used during init is small
  */
 void av_resample_compensate(AVResampleContext *c, int sample_delta, int compensation_distance){
@@ -196,7 +198,7 @@ int av_resample(AVResampleContext *c, short *dst, short *src, int *consumed, int
         int64_t index2= ((int64_t)index)<<32;
         int64_t incr= (1LL<<32) * c->dst_incr / c->src_incr;
         dst_size= FFMIN(dst_size, (src_size-1-index) * (int64_t)c->src_incr / c->dst_incr);
-        
+
         for(dst_index=0; dst_index < dst_size; dst_index++){
             dst[dst_index] = src[index2>>32];
             index2 += incr;
@@ -210,10 +212,10 @@ int av_resample(AVResampleContext *c, short *dst, short *src, int *consumed, int
         FELEM *filter= c->filter_bank + c->filter_length*(index & c->phase_mask);
         int sample_index= index >> c->phase_shift;
         FELEM2 val=0;
-                
+
         if(sample_index < 0){
             for(i=0; i<c->filter_length; i++)
-                val += src[ABS(sample_index + i) % src_size] * filter[i];
+                val += src[FFABS(sample_index + i) % src_size] * filter[i];
         }else if(sample_index + c->filter_length > src_size){
             break;
         }else if(c->linear){
@@ -260,13 +262,13 @@ int av_resample(AVResampleContext *c, short *dst, short *src, int *consumed, int
         c->dst_incr= dst_incr_frac + c->src_incr*dst_incr;
         c->compensation_distance= compensation_distance;
     }
-#if 0    
+#if 0
     if(update_ctx && !c->compensation_distance){
 #undef rand
         av_resample_compensate(c, rand() % (8000*2) - 8000, 8000*2);
 av_log(NULL, AV_LOG_DEBUG, "%d %d %d\n", c->dst_incr, c->ideal_dst_incr, c->compensation_distance);
     }
 #endif
-    
+
     return dst_index;
 }