Commit f64d7e91 authored by Vittorio Giovara's avatar Vittorio Giovara

mtv: improve header check and avoid division by zero

CC: libav-stable@libav.org
Bug-Id: CID 732203 / CID 732204
parent b3d11437
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment