[SCM] libav/experimental: If missing, calculate width or height from bpp and image size lowering the probe score too.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9cf6bbb9936b8afed2ef3e8ab2a462fa7f537a4f
Author: Reynaldo H. Verdejo Pinochet <reynaldo at opendot.cl>
Date:   Sun Oct 18 23:56:00 2009 +0000

    If missing, calculate width or height from bpp and
    image size lowering the probe score too.
    
    Originally committed as revision 20304 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index ef07e4a..0547430 100644
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -61,6 +61,15 @@ static int mtv_probe(AVProbeData *p)
     if(!(p->buf[51] && AV_RL16(&p->buf[52]) | AV_RL16(&p->buf[54])))
         return 0;
 
+    /* If width or height are 0 then imagesize header field should not */
+    if(AV_RL16(&p->buf[52]) && AV_RL16(&p->buf[54]))
+    {
+        if(!!AV_RL16(&p->buf[56]))
+            return AVPROBE_SCORE_MAX/2;
+        else
+            return 0;
+    }
+
     return AVPROBE_SCORE_MAX;
 }
 
@@ -82,6 +91,17 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
     mtv->img_width         = get_le16(pb);
     mtv->img_height        = get_le16(pb);
     mtv->img_segment_size  = get_le16(pb);
+
+    /* Calculate width and height if missing from header */
+
+    if(!mtv->img_width)
+        mtv->img_width=mtv->img_segment_size / (mtv->img_bpp>>3)
+                        / mtv->img_height;
+
+    if(!mtv->img_height)
+        mtv->img_height=mtv->img_segment_size / (mtv->img_bpp>>3)
+                        / mtv->img_width;
+
     url_fskip(pb, 4);
     audio_subsegments = get_le16(pb);
     mtv->full_segment_size =

-- 
Libav/FFmpeg packaging