[FFmpeg-cvslog] rtmpproto: Ignore errors from the getStreamLength method

Martin Storsjö git at videolan.org
Wed Nov 5 10:34:36 CET 2014


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Tue Nov  4 09:23:35 2014 +0200| [a490391157dcf4dc6b65352ec3eea2781dd0a404] | committer: Martin Storsjö

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 at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a490391157dcf4dc6b65352ec3eea2781dd0a404
---

 libavformat/rtmpproto.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 5ff661a..9511946 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) {



More information about the ffmpeg-cvslog mailing list