[MPlayer-cvslog] r28338 - in trunk: libaf/af_resample.c libmpdemux/demux_lavf.c

[cehoyos]

Author: cehoyos
Date: Sat Jan 17 12:29:36 2009
New Revision: 28338

Log:
Fix compilation: s/ff_gcd/av_gcd.

Modified:
   trunk/libaf/af_resample.c
   trunk/libmpdemux/demux_lavf.c

Modified: trunk/libaf/af_resample.c
==============================================================================
--- trunk/libaf/af_resample.c	Fri Jan 16 22:04:52 2009	(r28337)
+++ trunk/libaf/af_resample.c	Sat Jan 17 12:29:36 2009	(r28338)
@@ -201,7 +201,7 @@ static int control(struct af_instance_s*
     }
 
     // Calculate up and down sampling factors
-    d=ff_gcd(af->data->rate,n->rate);
+    d=av_gcd(af->data->rate,n->rate);
 
     // If sloppy resampling is enabled limit the upsampling factor
     if(((s->setup & FREQ_MASK) == FREQ_SLOPPY) && (af->data->rate/d > 5000)){
@@ -209,7 +209,7 @@ static int control(struct af_instance_s*
       int dn=n->rate/2;
       int m=2;
       while(af->data->rate/(d*m) > 5000){
-	d=ff_gcd(up,dn);
+	d=av_gcd(up,dn);
 	up/=2; dn/=2; m*=2;
       }
       d*=m;

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Fri Jan 16 22:04:52 2009	(r28337)
+++ trunk/libmpdemux/demux_lavf.c	Sat Jan 17 12:29:36 2009	(r28338)
@@ -263,7 +263,7 @@ static void handle_stream(demuxer_t *dem
                 sh_audio->audio.dwScale= codec->block_align ? codec->block_align*8 : 8;
                 sh_audio->audio.dwRate = codec->bit_rate;
             }
-            g= ff_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate);
+            g= av_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate);
             sh_audio->audio.dwScale /= g;
             sh_audio->audio.dwRate  /= g;
 //          printf("sca:%d rat:%d fs:%d sr:%d ba:%d\n", sh_audio->audio.dwScale, sh_audio->audio.dwRate, codec->frame_size, codec->sample_rate, codec->block_align);