From d84d6fbf28e4d655611872cae0e142a8f2d06c10 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Mon, 9 Feb 2009 01:46:01 +0000 Subject: [PATCH] Increase the number of packets required to identify as MPEG PES to keep from identifying MP3 files with padding or garbage at the beginning. Originally committed as revision 17091 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 0c43a5ec5d..255981b23c 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -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