aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-24 02:50:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-24 03:00:37 +0200
commitf8951d36dfca2f131b867aaecd7510f007aaf503 (patch)
tree0da8e0d41ffc12d96cf2323d6eba5eaad4c5919c
parentc0d847e457c1ef72843a63853f1135d52b74131e (diff)
parenteb7ddb5066843ab16caf33b05eafb2576648b797 (diff)
downloadffmpeg-f8951d36dfca2f131b867aaecd7510f007aaf503.tar.gz
Merge commit 'eb7ddb5066843ab16caf33b05eafb2576648b797'
* commit 'eb7ddb5066843ab16caf33b05eafb2576648b797': rtsp: Don't warn about unparsed time ranges Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/rtsp.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 45d89738c5..fe9adebf9f 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -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);
}
}