[FFmpeg-cvslog] avformat/mov: Fix duration of fragmented mov
Michael Niedermayer
git at videolan.org
Sun Jul 7 19:13:54 CEST 2013
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 7 02:42:40 2013 +0200| [ba8d68462228b5ae0d4726a00150cdae26ad4ff4] | 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)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba8d68462228b5ae0d4726a00150cdae26ad4ff4
---
libavformat/mov.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index a789750..cc1d596 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -880,7 +880,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 */
More information about the ffmpeg-cvslog
mailing list