[FFmpeg-cvslog] r20762 - trunk/libavformat/mpeg.c

[michael]

Author: michael
Date: Tue Dec  8 13:19:30 2009
New Revision: 20762

Log:
Flip the comparission direction of vid+audio+priv1 and pspack, it appears to have
been wrong.
Fixes issue1571.

Modified:
   trunk/libavformat/mpeg.c

Modified: trunk/libavformat/mpeg.c
==============================================================================
--- trunk/libavformat/mpeg.c	Mon Dec  7 22:06:51 2009	(r20761)
+++ trunk/libavformat/mpeg.c	Tue Dec  8 13:19:30 2009	(r20762)
@@ -79,7 +79,7 @@ static int mpegps_probe(AVProbeData *p)
 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, p->buf_size);
     if(sys>invalid && sys*9 <= pspack*10)
         return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
-    if(priv1 + vid + audio > invalid && (priv1+vid+audio)*9 <= pspack*10)
+    if(pspack > invalid && (priv1+vid+audio)*10 >= pspack*9)
         return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
     if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048 && vid + audio > invalid) /* PES stream */
         return (audio > 12 || vid > 3) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4;