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:58:36 +0200 |
| commit | e445dc9237ae3c87565480936b4feba31f7de998 (patch) | |
| tree | ac19d289122f553d645e88a48d13b5f519e2048b /libavformat/mov.c | |
| parent | c25c89a530957fd63ef9ed7fc597bf19b76279cc (diff) | |
| download | ffmpeg-e445dc9237ae3c87565480936b4feba31f7de998.tar.gz | |
avformat/mov: Fix duration of fragmented mov
Fixes Ticket2757
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dc2a13aa802fc691c25d5e0194818831058316ee)
Conflicts:
libavformat/mov.c
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 0cc94e5944..65d8798276 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 */ |