RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'eb7ddb5066843ab16caf33b05eafb2576648b797' 

* commit 'eb7ddb5066843ab16caf33b05eafb2576648b797':
  rtsp: Don't warn about unparsed time ranges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-24 02:50:47 +02:00
parent c0d847e457 eb7ddb5066
commit f8951d36df
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/rtsp.c
View File

@ -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);
}
}