aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-03-20 11:07:53 +0200
committerMartin Storsjö <martin@martin.st>2013-03-20 12:00:28 +0200
commita5e6080a8d85122ba67bf6e5d1592b82a0397b5b (patch)
tree132dfd63e0307dd0b019f286398ad4107f0cc7e9
parentc3ebfcd6e1327ca7bbcaee822e593c2da6cfd352 (diff)
downloadffmpeg-a5e6080a8d85122ba67bf6e5d1592b82a0397b5b.tar.gz
rtmp: Pass the parameters to do_adobe_auth in the right order
do_adobe_auth takes the parameters in the order "opaque, challenge". Due to the way they are treated, this didn't matter in the tested setups though - if both are set, we only use one. In the tested setups (Wowza and Akamai) either one of them were null or they were both set to the same value, which is why this worked before. Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavformat/rtmpproto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 78ebbf1c10..d1141af876 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -1693,7 +1693,7 @@ static int handle_connect_error(URLContext *s, const char *desc)
}
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;
} else {
if ((ret = do_llnw_auth(rt, user, nonce)) < 0)