Merge commit 'f64d7e919eabd427f3e6dd4a1219e448c78deb42'

* commit 'f64d7e919eabd427f3e6dd4a1219e448c78deb42':
  mtv: improve header check and avoid division by zero

Conflicts:
	libavformat/mtv.c

See: 8b9b6332dfeb169098c8ab1351d66fc5b474dd55
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/mtv.c
index 1d5f266,7ad7618..addad24
--- 1/libavformat/mtv.c
--- 2/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@@ -117,29 -94,18 +117,29 @@@ static int mtv_read_header(AVFormatCont
      mtv->img_height        = avio_rl16(pb);
      mtv->img_segment_size  = avio_rl16(pb);
  
 +    /* Assume 16bpp even if claimed otherwise.
 +     * We know its going to be RGBG565/555 anyway
 +     */
 +    if (mtv->img_bpp != MTV_IMAGE_DEFAULT_BPP) {
 +        av_log (s, AV_LOG_WARNING, "Header claims %dbpp (!= 16). Ignoring\n",
 +                mtv->img_bpp);
 +        mtv->img_bpp = MTV_IMAGE_DEFAULT_BPP;
 +    }
 +
      /* Calculate width and height if missing from header */
  
-     if(!mtv->img_width && mtv->img_height)
-         mtv->img_width=mtv->img_segment_size / (mtv->img_bpp)
+     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 && mtv->img_width)
-         mtv->img_height=mtv->img_segment_size / (mtv->img_bpp)
+     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)
 +    if(!mtv->img_height || !mtv->img_width || !mtv->img_segment_size){
 +        av_log(s, AV_LOG_ERROR, "width or height or segment_size is invalid and I cannot calculate them from other information\n");
-         return AVERROR(EINVAL);
+         return AVERROR_INVALIDDATA;
 +    }
  
      avio_skip(pb, 4);
      audio_subsegments = avio_rl16(pb);