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

Merge commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404' 

* commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404':
  rtmpproto: Ignore errors from the getStreamLength method

Conflicts:
	libavformat/rtmpproto.c

See: 09711545f5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-05 10:17:07 +01:00
parent 37425fcb04 a490391157
commit 513d57cc4d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtmpproto.c
View File

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