[FFmpeg-cvslog] rtmp: Pass the parameters to do_adobe_auth in the right order

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Mar 20 11:07:53 2013 +0200| [a5e6080a8d85122ba67bf6e5d1592b82a0397b5b] | committer: Martin Storsjö

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

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

 libavformat/rtmpproto.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 78ebbf1..d1141af 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)