diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-31 03:59:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-31 03:59:29 +0200 |
| commit | 00ddf620783194f46fc0d5edc286e48a73a40998 (patch) | |
| tree | d5e114d2a663eac0de6d37ba005e323d0eb14c97 /libavformat/mpeg.c | |
| parent | 3b5ba60aa76cb2701521aed546b3a3b174960bc4 (diff) | |
| download | ffmpeg-00ddf620783194f46fc0d5edc286e48a73a40998.tar.gz | |
mpegdemux: Fix probing of unrecognized_mpeg_video.mpg
Fixes Ticket1586
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpeg.c')
| -rw-r--r-- | libavformat/mpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index ec04022241..3183f87faa 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -87,7 +87,7 @@ static int mpegps_probe(AVProbeData *p) //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, invalid, 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 + return (audio > 12 || vid > 3 || pspack > 2) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg 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 */ |