aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-29 13:42:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-29 13:43:07 +0200
commit5f9b1aae504fd6842b049866b0974f710e0bd3ca (patch)
treea44517fe5156c7920e77bec7497af6f9b1009eb6
parent8b79a458c084632ef5d911cb135c52db59b402ff (diff)
parent6454c44f9f74dbaed17d32cf0eaec185386c27fa (diff)
downloadffmpeg-5f9b1aae504fd6842b049866b0974f710e0bd3ca.tar.gz
Merge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'
* commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa': rtmpproto: Fix limelight authentication with abbreviated app names Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/rtmpproto.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index f230f9eca1..0f827f848a 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -1609,6 +1609,8 @@ static int do_llnw_auth(RTMPContext *rt, const char *user, const char *nonce)
av_md5_update(md5, method, strlen(method));
av_md5_update(md5, ":/", 2);
av_md5_update(md5, rt->app, strlen(rt->app));
+ if (!strchr(rt->app, '/'))
+ av_md5_update(md5, "/_definst_", strlen("/_definst_"));
av_md5_final(md5, hash);
ff_data_to_hex(hashstr2, hash, 16, 1);
hashstr2[32] = '\0';