aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-07 19:18:21 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-11-01 15:52:43 +0100
commit4e2e997fafc68da52bf3ba112ae1828b774d0870 (patch)
treed97f025b6f69d16fb82b42e22f86015ea1534e86
parent19ccc06d8b617ba48c3122decf59b9e3376b415b (diff)
downloadffmpeg-4e2e997fafc68da52bf3ba112ae1828b774d0870.tar.gz
avformat/mpeg: increase score for short mpeg-ps by 1
Fixes Ticket 3855 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5109ce2017c15202275b33bce58ec9d88044eeb5)
-rw-r--r--libavformat/mpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 7d0be5ed72..14a75c0201 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -101,7 +101,7 @@ static int mpegps_probe(AVProbeData *p)
if (sys > invalid && sys * 9 <= pspack * 10)
return (audio > 12 || vid > 3 || pspack > 2) ? AVPROBE_SCORE_EXTENSION + 2
- : AVPROBE_SCORE_EXTENSION / 2; // 1 more than .mpg
+ : AVPROBE_SCORE_EXTENSION / 2 + 1; // 1 more than .mpg
if (pspack > invalid && (priv1 + vid + audio) * 10 >= pspack * 9)
return pspack > 2 ? AVPROBE_SCORE_EXTENSION + 2
: AVPROBE_SCORE_EXTENSION / 2; // 1 more than .mpg