diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 12:03:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 12:03:53 +0100 |
| commit | e7dd0365f293231d8fffa828bd170695e695fe18 (patch) | |
| tree | 928af06866f15381fe74c7f5040f411efb9f9312 | |
| parent | f7fee8f700c27273fd0398d89c00ff7725bbf3fa (diff) | |
| parent | a5e6080a8d85122ba67bf6e5d1592b82a0397b5b (diff) | |
| download | ffmpeg-e7dd0365f293231d8fffa828bd170695e695fe18.tar.gz | |
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>
| -rw-r--r-- | libavformat/rtmpproto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 598122a229..d73e015d55 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -1690,7 +1690,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) |