[SCM] libav/experimental: Do not return values above AVPROBE_SCORE_MAX from probe().

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:51:09 UTC 2013


The following commit has been merged in the experimental branch:
commit 0535f919d5780e861c1ae5be61dac950a6d8a442
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Sep 15 13:28:14 2009 +0000

    Do not return values above AVPROBE_SCORE_MAX from probe().
    
    Originally committed as revision 19857 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/ncdec.c b/libavformat/ncdec.c
index 056381b..8e51f84 100644
--- a/libavformat/ncdec.c
+++ b/libavformat/ncdec.c
@@ -35,7 +35,7 @@ static int nc_probe(AVProbeData *probe_packet)
     size = AV_RL16(probe_packet->buf + 5);
 
     if (size + 20 > probe_packet->buf_size)
-        return 3*AVPROBE_SCORE_MAX/2;
+        return AVPROBE_SCORE_MAX/4;
 
     if (AV_RB32(probe_packet->buf+16+size) == NC_VIDEO_FLAG)
         return AVPROBE_SCORE_MAX;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list