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

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  rtmp: Pass the parameters to do_adobe_auth in the right order

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-20 12:03:49 +01:00
parent f7fee8f700 a5e6080a8d
commit e7dd0365f2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rtmpproto.c
View File

@ -1690,7 +1690,7 @@ static int handle_connect_error(URLContext *s, const char *desc)
} }
if (!strcmp(authmod, "adobe")) { if (!strcmp(authmod, "adobe")) {
if ((ret = do_adobe_auth(rt, user, salt, challenge, opaque)) < 0) if ((ret = do_adobe_auth(rt, user, salt, opaque, challenge)) < 0)
return ret; return ret;
} else { } else {
if ((ret = do_llnw_auth(rt, user, nonce)) < 0) if ((ret = do_llnw_auth(rt, user, nonce)) < 0)