diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-14 01:36:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-14 02:20:10 +0200 |
| commit | 00c4861f13d9ec302348cfa1e2d4f1c796e9e86b (patch) | |
| tree | 7f6a64a484ab2b2f07f81b3d62b0cb0ebd3931f7 /libavformat/mpegts.c | |
| parent | 9da27fb579586377ee7f764c5de04fda6740c486 (diff) | |
| download | ffmpeg-00c4861f13d9ec302348cfa1e2d4f1c796e9e86b.tar.gz | |
avformat/mpegts: adjust probe score for low check_count
Fixes mis-detection of tiff as mpegts
Fixes Ticket5565
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 7d78c41d3c..4d1bc6d427 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2508,8 +2508,10 @@ static int mpegts_probe(AVProbeData *p) ff_dlog(0, "TS score: %d %d\n", sumscore, maxscore); - if (check_count >= CHECK_COUNT && sumscore > 6) { + if (check_count > CHECK_COUNT && sumscore > 6) { return AVPROBE_SCORE_MAX + sumscore - CHECK_COUNT; + } else if (check_count >= CHECK_COUNT && sumscore > 6) { + return AVPROBE_SCORE_MAX/2 + sumscore - CHECK_COUNT; } else if (check_count >= CHECK_COUNT && maxscore > 6) { return AVPROBE_SCORE_MAX/2 + sumscore - CHECK_COUNT; } else if (sumscore > 6) { |