Mercurial > mplayer.hg

changeset 28303:44d67f7f8eb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation: s/ff_gcd/av_gcd.
author cehoyos
date Sat, 17 Jan 2009 11:29:36 +0000
parents af0b0ae25b84
children 9b5e7dcc09f9
files libaf/af_resample.c libmpdemux/demux_lavf.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libaf/af_resample.c	Fri Jan 16 21:04:52 2009 +0000
+++ b/libaf/af_resample.c	Sat Jan 17 11:29:36 2009 +0000
@@ -201,7 +201,7 @@
     }
 
     // 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 @@
       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;
--- a/libmpdemux/demux_lavf.c	Fri Jan 16 21:04:52 2009 +0000
+++ b/libmpdemux/demux_lavf.c	Sat Jan 17 11:29:36 2009 +0000
@@ -263,7 +263,7 @@
                 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);