aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtmpproto.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-11-04 09:23:35 +0200
committerMartin Storsjö <martin@martin.st>2014-11-05 09:18:22 +0200
commita490391157dcf4dc6b65352ec3eea2781dd0a404 (patch)
tree79b00b4e60439c9cb7d3cd28ab66d635cc4d01dd /libavformat/rtmpproto.c
parent4ff670d99bebd97429322719089363d83143477d (diff)
downloadffmpeg-a490391157dcf4dc6b65352ec3eea2781dd0a404.tar.gz
rtmpproto: Ignore errors from the getStreamLength method
It is never an error if this method failed. If rt->live was explicitly set to 0 (known to be a recorded file), print it as a warning, otherwise print it as a debug message. Based on a patch by Michael Niedermayer. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtmpproto.c')
-rw-r--r--libavformat/rtmpproto.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 5ff661a465..9511946fc1 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -1816,6 +1816,9 @@ static int handle_invoke_error(URLContext *s, RTMPPacket *pkt)
/* Gracefully ignore Adobe-specific historical artifact errors. */
level = AV_LOG_WARNING;
ret = 0;
+ } else if (tracked_method && !strcmp(tracked_method, "getStreamLength")) {
+ level = rt->live ? AV_LOG_DEBUG : AV_LOG_WARNING;
+ ret = 0;
} else if (tracked_method && !strcmp(tracked_method, "connect")) {
ret = handle_connect_error(s, tmpstr);
if (!ret) {