diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 02:42:40 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-07-07 18:45:31 +0200 |
| commit | e68b62a014b680d32fe9e2aee5c3bc4246a70ee9 (patch) | |
| tree | abc0d24a49148133e8b5fe517bc7fe1cb75b39aa | |
| parent | 8c5c4adebbf6b81c505b04414f7466d4e2b0dcbb (diff) | |
| download | ffmpeg-e68b62a014b680d32fe9e2aee5c3bc4246a70ee9.tar.gz | |
avformat/mov: Fix duration of fragmented mov
Fixes Ticket2757
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dc2a13aa802fc691c25d5e0194818831058316ee)
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 73c8be0246..4c6155895e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -858,7 +858,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 */ |