RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix compilation: s/ff_gcd/av_gcd. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28338 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
cehoyos 2009-01-17 11:29:36 +00:00
parent f14ff6d054
commit 83c523f9ea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libaf/af_resample.c
View File

@ -201,7 +201,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
} }
// Calculate up and down sampling factors // 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 sloppy resampling is enabled limit the upsampling factor
if(((s->setup & FREQ_MASK) == FREQ_SLOPPY) && (af->data->rate/d > 5000)){ 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 dn=n->rate/2;
int m=2; int m=2;
while(af->data->rate/(d*m) > 5000){ while(af->data->rate/(d*m) > 5000){
d=ff_gcd(up,dn); d=av_gcd(up,dn);
up/=2; dn/=2; m*=2; up/=2; dn/=2; m*=2;
} }
d*=m; d*=m;

2
libmpdemux/demux_lavf.c
View File

@ -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.dwScale= codec->block_align ? codec->block_align*8 : 8;
sh_audio->audio.dwRate = codec->bit_rate; 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.dwScale /= g;
sh_audio->audio.dwRate /= 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); // 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);