From 83c523f9ea76c556c1a8ee878ee91f15fe7ec1c6 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sat, 17 Jan 2009 11:29:36 +0000 Subject: Fix compilation: s/ff_gcd/av_gcd. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28338 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libaf/af_resample.c | 4 ++-- libmpdemux/demux_lavf.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libaf/af_resample.c b/libaf/af_resample.c index 57335532c4..0953217c4c 100644 --- a/libaf/af_resample.c +++ b/libaf/af_resample.c @@ -201,7 +201,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) } // 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* af, int cmd, void* arg) 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; diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index c1b302381f..9749054a03 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -263,7 +263,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { 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); -- cgit v1.2.3