[FFmpeg-cvslog] lavf/mpegts: Return 0 if the probe function does not detect mpegts.

Carl Eugen Hoyos git at videolan.org
Mon Jun 29 17:41:01 CEST 2015


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Jun 29 16:27:36 2015 +0200| [77c0b149be120ab6b0a0a536b309aba0d4bc8261] | committer: Carl Eugen Hoyos

lavf/mpegts: Return 0 if the probe function does not detect mpegts.

Reduces console spamming on debug level.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77c0b149be120ab6b0a0a536b309aba0d4bc8261
---

 libavformat/mpegts.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 37043a6..4a8a244 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



More information about the ffmpeg-cvslog mailing list