From 9ce6c1387988bf3cdb631f3844e99a0c9bea43f2 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sat, 17 Jan 2009 11:13:33 +0000 Subject: export gcd function as av_gcd() Originally committed as revision 16653 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mov.c | 4 ++-- libavformat/nutdec.c | 2 +- libavformat/riff.c | 2 +- libavformat/utils.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libavformat') diff --git a/libavformat/mov.c b/libavformat/mov.c index 5638d34..b510d7c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1172,7 +1172,7 @@ static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOVAtom atom) 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 @@ static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOVAtom atom) 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 --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 4d838a5..02d828a 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -206,7 +206,7 @@ static int decode_main_header(NUTContext *nut){ 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 --git a/libavformat/riff.c b/libavformat/riff.c index ed92187..73ebc91 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -466,7 +466,7 @@ void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssiz *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 --git a/libavformat/utils.c b/libavformat/utils.c index a675048..1778bba 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2727,7 +2727,7 @@ static void dump_stream_format(AVFormatContext *ic, int i, int index, int is_out 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 @@ char *ff_data_to_hex(char *buff, const uint8_t *src, int s) 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; -- cgit v1.1