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:37:12 +0200 |
| commit | ba8d68462228b5ae0d4726a00150cdae26ad4ff4 (patch) | |
| tree | 8761f138437dc2b7eab2ed1d94f146b0f9ee2015 | |
| parent | 25ed0f05fdc3a4fedb2b8257df60103140588db6 (diff) | |
| download | ffmpeg-ba8d68462228b5ae0d4726a00150cdae26ad4ff4.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 a789750a55..cc1d596ac1 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 */ |