# HG changeset patch # User aurel # Date 1232190813 0 # Node ID 44f4dca12784035b84c265d3fe462f9a3142b605 # Parent c507e877c0ee28adddbff26459479b08a3578cee export gcd function as av_gcd() diff -r c507e877c0ee -r 44f4dca12784 mov.c --- a/mov.c Sat Jan 17 04:31:42 2009 +0000 +++ b/mov.c Sat Jan 17 11:13:33 2009 +0000 @@ -1172,7 +1172,7 @@ sc->stts_data[i].count= sample_count; sc->stts_data[i].duration= sample_duration; - sc->time_rate= ff_gcd(sc->time_rate, sample_duration); + sc->time_rate= av_gcd(sc->time_rate, sample_duration); dprintf(c->fc, "sample_count=%d, sample_duration=%d\n",sample_count,sample_duration); @@ -1215,7 +1215,7 @@ sc->ctts_data[i].count = count; sc->ctts_data[i].duration= duration; - sc->time_rate= ff_gcd(sc->time_rate, FFABS(duration)); + sc->time_rate= av_gcd(sc->time_rate, FFABS(duration)); } return 0; } diff -r c507e877c0ee -r 44f4dca12784 nutdec.c --- a/nutdec.c Sat Jan 17 04:31:42 2009 +0000 +++ b/nutdec.c Sat Jan 17 11:13:33 2009 +0000 @@ -206,7 +206,7 @@ for(i=0; itime_base_count; i++){ GET_V(nut->time_base[i].num, tmp>0 && tmp<(1ULL<<31)) GET_V(nut->time_base[i].den, tmp>0 && tmp<(1ULL<<31)) - if(ff_gcd(nut->time_base[i].num, nut->time_base[i].den) != 1){ + if(av_gcd(nut->time_base[i].num, nut->time_base[i].den) != 1){ av_log(s, AV_LOG_ERROR, "time base invalid\n"); return -1; } diff -r c507e877c0ee -r 44f4dca12784 riff.c --- a/riff.c Sat Jan 17 04:31:42 2009 +0000 +++ b/riff.c Sat Jan 17 11:13:33 2009 +0000 @@ -466,7 +466,7 @@ *au_scale= stream->block_align ? stream->block_align*8 : 8; *au_rate = stream->bit_rate ? stream->bit_rate : 8*stream->sample_rate; } - gcd= ff_gcd(*au_scale, *au_rate); + gcd= av_gcd(*au_scale, *au_rate); *au_scale /= gcd; *au_rate /= gcd; } diff -r c507e877c0ee -r 44f4dca12784 utils.c --- a/utils.c Sat Jan 17 04:31:42 2009 +0000 +++ b/utils.c Sat Jan 17 11:13:33 2009 +0000 @@ -2727,7 +2727,7 @@ char buf[256]; int flags = (is_output ? ic->oformat->flags : ic->iformat->flags); AVStream *st = ic->streams[i]; - int g = ff_gcd(st->time_base.num, st->time_base.den); + int g = av_gcd(st->time_base.num, st->time_base.den); avcodec_string(buf, sizeof(buf), st->codec, is_output); av_log(NULL, AV_LOG_INFO, " Stream #%d.%d", index, i); /* the pid is an important information, so we display it */ @@ -3192,7 +3192,7 @@ void av_set_pts_info(AVStream *s, int pts_wrap_bits, int pts_num, int pts_den) { - unsigned int gcd= ff_gcd(pts_num, pts_den); + unsigned int gcd= av_gcd(pts_num, pts_den); s->pts_wrap_bits = pts_wrap_bits; s->time_base.num = pts_num/gcd; s->time_base.den = pts_den/gcd;