Browse Source

mov: Fix FPE on 0 time_scale

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.11
Michael Niedermayer 13 years ago
parent
commit
ac2cb27916
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavformat/mov.c

+ 2
- 1
libavformat/mov.c View File

@@ -805,7 +805,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->fc->duration = av_rescale(c->duration, AV_TIME_BASE, c->time_scale);
avio_rb32(pb); /* preferred scale */

avio_rb16(pb); /* preferred volume */


Loading…
Cancel
Save