[FFmpeg-cvslog] avformat/mov: Fix duration of fragmented mov

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sun Jul  7 02:42:40 2013 +0200| [e445dc9237ae3c87565480936b4feba31f7de998] | committer: Carl Eugen Hoyos

avformat/mov: Fix duration of fragmented mov

Fixes Ticket2757

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit dc2a13aa802fc691c25d5e0194818831058316ee)

Conflicts:
	libavformat/mov.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e445dc9237ae3c87565480936b4feba31f7de998
---

 libavformat/mov.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 0cc94e5..65d8798 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -801,7 +801,8 @@ 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
-    c->fc->duration = av_rescale(c->duration, AV_TIME_BASE, c->time_scale);
+    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 */
 
     avio_rb16(pb); /* preferred volume */