diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-07 19:18:21 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-11-01 17:39:42 +0100 |
| commit | e5cf4d16c60e438ba027947645a1d0a732b49257 (patch) | |
| tree | b0bcb9228490087100ccd4a841aed2ee5bd3d107 | |
| parent | e0465d6fcf3a5490d9912fd904a443f84f0f2e42 (diff) | |
| download | ffmpeg-e5cf4d16c60e438ba027947645a1d0a732b49257.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)
Conflicts:
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 82957a104b..a49fdbea42 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -91,7 +91,7 @@ static int mpegps_probe(AVProbeData *p) score= AVPROBE_SCORE_MAX/4; if(sys>invalid && sys*9 <= pspack*10) - return (audio > 12 || vid > 3 || 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; // +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 */ |