aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-06-29 16:27:36 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-06-29 16:27:36 +0200
commit77c0b149be120ab6b0a0a536b309aba0d4bc8261 (patch)
treeef8a0442a250099c06316195d00f3d500bc3ce48
parentdee7943819042f310d7995671d3e39f4dd31d770 (diff)
downloadffmpeg-77c0b149be120ab6b0a0a536b309aba0d4bc8261.tar.gz
lavf/mpegts: Return 0 if the probe function does not detect mpegts.
Reduces console spamming on debug level.
-rw-r--r--libavformat/mpegts.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 37043a69f4..4a8a244a67 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2439,7 +2439,7 @@ static int mpegts_probe(AVProbeData *p)
#define CHECK_BLOCK 100
if (check_count < CHECK_COUNT)
- return AVERROR_INVALIDDATA;
+ return 0;
for (i = 0; i<check_count; i+=CHECK_BLOCK) {
int left = FFMIN(check_count - i, CHECK_BLOCK);
@@ -2459,7 +2459,7 @@ static int mpegts_probe(AVProbeData *p)
if (sumscore > 6) return AVPROBE_SCORE_MAX + sumscore - CHECK_COUNT;
else if (maxscore > 6) return AVPROBE_SCORE_MAX/2 + sumscore - CHECK_COUNT;
else
- return AVERROR_INVALIDDATA;
+ return 0;
}
/* return the 90kHz PCR and the extension for the 27MHz PCR. return