diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-05 10:17:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-05 10:17:07 +0100 |
| commit | 513d57cc4d3355baf4fca46cb1d2e6a0d82ee82a (patch) | |
| tree | e9598c24312127f179b4eb0c0ec74ead47fa96c6 | |
| parent | 37425fcb04748cf3177113f1615447bf7b3cb7ba (diff) | |
| parent | a490391157dcf4dc6b65352ec3eea2781dd0a404 (diff) | |
| download | ffmpeg-513d57cc4d3355baf4fca46cb1d2e6a0d82ee82a.tar.gz | |
Merge commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404'
* commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404':
rtmpproto: Ignore errors from the getStreamLength method
Conflicts:
libavformat/rtmpproto.c
See: 09711545f5d256bd3ac77004d123dae36c5db8f9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtmpproto.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index b11c883c2b..ba5adefb8e 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -1822,10 +1822,8 @@ static int handle_invoke_error(URLContext *s, RTMPPacket *pkt) /* Gracefully ignore Adobe-specific historical artifact errors. */ level = AV_LOG_WARNING; ret = 0; - } else if (rt->live && - tracked_method && - !strcmp(tracked_method, "getStreamLength")) { - level = AV_LOG_DEBUG; + } 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); |