From: Michael Niedermayer Date: Sun, 7 Jul 2013 00:42:40 +0000 (+0200) Subject: avformat/mov: Fix duration of fragmented mov X-Git-Tag: n2.0~69 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=dc2a13aa802fc691c25d5e0194818831058316ee avformat/mov: Fix duration of fragmented mov Fixes Ticket2757 Signed-off-by: Michael Niedermayer --- diff --git a/libavformat/mov.c b/libavformat/mov.c index 37030a57e2..9833d7badd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -877,7 +877,7 @@ static int mov_read_mvhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) c->duration = (version == 1) ? avio_rb64(pb) : avio_rb32(pb); /* duration */ // set the AVCodecContext duration because the duration of individual tracks // may be inaccurate - if (c->time_scale > 0) + if (c->time_scale > 0 && !c->trex_data) c->fc->duration = av_rescale(c->duration, AV_TIME_BASE, c->time_scale); avio_rb32(pb); /* preferred scale */