[FFmpeg-cvslog] rtsp: Don't warn about unparsed time ranges
Martin Storsjö
git at videolan.org
Fri Apr 24 03:01:20 CEST 2015
ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Apr 22 23:15:58 2015 +0300| [eb7ddb5066843ab16caf33b05eafb2576648b797] | committer: Martin Storsjö
rtsp: Don't warn about unparsed time ranges
This removes the error logging added in 4e54432164.
This avoids warnings about "Invalid interval start specification 'now'"
for live rtsp streams.
We only try to parse some of the many valid values for time ranges
in RTSP - the other ones are fully valid but not interesting for the
use case in rtsp.c, so we shouldn't warn about them.
(Parsing the time ranges is needed to allow seeking, but e.g. setting
the current realtime clock for the start time doesn't make sense.
av_parse_time has got a different mode for parsing absolute times
as well, which can handle the special case "now", but that doesn't
make much sense for this particular use in rtsp.c.)
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb7ddb5066843ab16caf33b05eafb2576648b797
---
libavformat/rtsp.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 70b948d..1b60b4f 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -169,15 +169,12 @@ static void rtsp_parse_range_npt(const char *p, int64_t *start, int64_t *end)
*end = AV_NOPTS_VALUE;
get_word_sep(buf, sizeof(buf), "-", &p);
- if (av_parse_time(start, buf, 1) < 0) {
- av_log(NULL, AV_LOG_ERROR, "Invalid interval start specification '%s'\n", buf);
+ if (av_parse_time(start, buf, 1) < 0)
return;
- }
if (*p == '-') {
p++;
get_word_sep(buf, sizeof(buf), "-", &p);
- if (av_parse_time(end, buf, 1) < 0)
- av_log(NULL, AV_LOG_ERROR, "Invalid interval end specification '%s'\n", buf);
+ av_parse_time(end, buf, 1);
}
}
More information about the ffmpeg-cvslog
mailing list