[SCM] libav/experimental: Fix wrong comparison in r20304

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:53:15 UTC 2013


The following commit has been merged in the experimental branch:
commit cbd8a722bb2d6b873d4ddaab414e5e782bc838f3
Author: Reynaldo H. Verdejo Pinochet <reynaldo at opendot.cl>
Date:   Mon Oct 19 01:42:05 2009 +0000

    Fix wrong comparison in r20304
    
    Originally committed as revision 20305 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index 0547430..13e8ac2 100644
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -62,7 +62,7 @@ static int mtv_probe(AVProbeData *p)
         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[52]) || !AV_RL16(&p->buf[54]))
     {
         if(!!AV_RL16(&p->buf[56]))
             return AVPROBE_SCORE_MAX/2;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list