[FFmpeg-cvslog] mov: Fix FPE on 0 time_scale

Michael Niedermayer git at videolan.org
Fri Mar 23 04:45:22 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 23 04:32:16 2012 +0100| [ac2cb279162218e92a5663caac27d695e6514b69] | committer: Michael Niedermayer

mov: Fix FPE on 0 time_scale

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac2cb279162218e92a5663caac27d695e6514b69
---

 libavformat/mov.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 66c1886..785d284 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -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 */



More information about the ffmpeg-cvslog mailing list