From: Alex Converse Date: Mon, 9 Feb 2009 01:46:01 +0000 (+0000) Subject: Increase the number of packets required to identify as MPEG PES to keep from X-Git-Tag: v0.5~684 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d84d6fbf28e4d655611872cae0e142a8f2d06c10;p=coroid%2Fffmpeg_saccubus.git 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 --- diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 0c43a5ec5..255981b23 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