Browse Source

mtv: improve header check and avoid division by zero

CC: libav-stable@libav.org
Bug-Id: CID 732203 / CID 732204
tags/n2.5
Vittorio Giovara 11 years ago
parent
commit
f64d7e919e
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      libavformat/mtv.c

+ 5
- 2
libavformat/mtv.c View File

@@ -96,14 +96,17 @@ static int mtv_read_header(AVFormatContext *s)

/* Calculate width and height if missing from header */

if(!mtv->img_width)
if (!mtv->img_width && mtv->img_height > 0 && mtv->img_bpp >= 8)
mtv->img_width=mtv->img_segment_size / (mtv->img_bpp>>3)
/ mtv->img_height;

if(!mtv->img_height)
if (!mtv->img_height && mtv->img_width > 0 && mtv->img_bpp >= 8)
mtv->img_height=mtv->img_segment_size / (mtv->img_bpp>>3)
/ mtv->img_width;

if (!mtv->img_width || !mtv->img_height)
return AVERROR_INVALIDDATA;

avio_skip(pb, 4);
audio_subsegments = avio_rl16(pb);



Loading…
Cancel
Save