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

[alexc]

Author: alexc
Date: Mon Feb  9 02:46:01 2009
New Revision: 17091

Log:
Increase the number of packets required to identify as MPEG PES to keep from
identifying MP3 files with padding or garbage at the beginning.

Modified:
   trunk/libavformat/mpeg.c

Modified: trunk/libavformat/mpeg.c
==============================================================================
--- trunk/libavformat/mpeg.c	Mon Feb  9 02:39:33 2009	(r17090)
+++ trunk/libavformat/mpeg.c	Mon Feb  9 02:46:01 2009	(r17091)
@@ -83,7 +83,7 @@ static int mpegps_probe(AVProbeData *p)
         return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
     if(priv1 + vid + audio > invalid && (priv1+vid+audio)*9 <= pspack*10)
         return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
-    if((!!vid ^ !!audio) && (audio+vid > 1) && !sys && !pspack && p->buf_size>2048) /* PES stream */
+    if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048) /* PES stream */
         return AVPROBE_SCORE_MAX/2+2;
 
     //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1