From c3aeaa540d6ff7b9829c3af1ffec3c708ddc70f7 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Mon, 18 Jan 2010 23:56:04 +0000 Subject: set average frame rate in mov demuxer Originally committed as revision 21310 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mov.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libavformat/mov.c') diff --git a/libavformat/mov.c b/libavformat/mov.c index 45e0520e47..aa66a01ec9 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1652,14 +1652,18 @@ static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOVAtom atom) } else sc->pb = c->fc->pb; - if (st->codec->codec_type == CODEC_TYPE_VIDEO && - (st->codec->width != sc->width || st->codec->height != sc->height)) { + if (st->codec->codec_type == CODEC_TYPE_VIDEO) { + if (st->codec->width != sc->width || st->codec->height != sc->height) { AVRational r = av_d2q(((double)st->codec->height * sc->width) / ((double)st->codec->width * sc->height), INT_MAX); if (st->sample_aspect_ratio.num) st->sample_aspect_ratio = av_mul_q(st->sample_aspect_ratio, r); else st->sample_aspect_ratio = r; + } + + av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den, + sc->time_scale*st->nb_frames, st->duration, INT_MAX); } switch (st->codec->codec_id) { -- cgit v1.2.3