diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 02:42:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 04:11:14 +0200 |
| commit | dc2a13aa802fc691c25d5e0194818831058316ee (patch) | |
| tree | 7521142a98a0d491c8e26dc04effb63235a5f8fd /libavformat/mov.c | |
| parent | 104dfaadaa0b794361a839cb5f82127f1815745a (diff) | |
| download | ffmpeg-dc2a13aa802fc691c25d5e0194818831058316ee.tar.gz | |
avformat/mov: Fix duration of fragmented mov
Fixes Ticket2757
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
| -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 37030a57e2..9833d7badd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -877,7 +877,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 */ |