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:25:25 +0200 |
| commit | 627772d9886f1a766c73dc161710c54de07bfdd3 (patch) | |
| tree | 8b75058a2938359cbed5c097385e2997d8086d53 | |
| parent | 5ce57e0248ec5b768568d9cc2aaf4d73a90b4d33 (diff) | |
| download | ffmpeg-627772d9886f1a766c73dc161710c54de07bfdd3.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 137f79b331..82972777a7 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 */ |