Browse Source

matroskadec: Ensure time_scale is nonzero, fixes divide-by-zero if the file

has 0 written

Based on a Chromium patch

Originally committed as revision 23167 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/n0.8
David Conrad 16 years ago
parent
commit
d98bd80ed3
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      libavformat/matroskadec.c

+ 2
- 0
libavformat/matroskadec.c View File

@@ -1154,6 +1154,8 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
return -1;
matroska_execute_seekhead(matroska);

if (!matroska->time_scale)
matroska->time_scale = 1000000;
if (matroska->duration)
matroska->ctx->duration = matroska->duration * matroska->time_scale
* 1000 / AV_TIME_BASE;


Loading…
Cancel
Save