aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-08 20:29:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-08 20:29:39 +0100
commit0643ff1712bd5fa063c230ae451a7da345d21575 (patch)
treeec5c9de44fcbbda13ebae7592773aec81d1d609d
parentb52f2d88fe3ec1225ddc76649e3fc1d1971e4f81 (diff)
downloadffmpeg-0643ff1712bd5fa063c230ae451a7da345d21575.tar.gz
mpegvideo_probe: dont be too picky on spec compliance and the lack of system startcodes.
Fixes Ticket620 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/mpegvideodec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c
index d146b1a829..1b057bdf99 100644
--- a/libavformat/mpegvideodec.c
+++ b/libavformat/mpegvideodec.c
@@ -50,8 +50,8 @@ static int mpegvideo_probe(AVProbeData *p)
else if((code & 0x1e0) == AUDIO_ID) apes++;
}
}
- if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !apes && !vpes)
- return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
+ if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !apes)
+ return (pic>1 && !vpes) ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
return 0;
}