Commit f8951d36 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'eb7ddb50'

* commit 'eb7ddb50':
  rtsp: Don't warn about unparsed time ranges
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c0d847e4 eb7ddb50
......@@ -174,15 +174,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);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment