From cb47c61e42e5a5e6f8e62d38284fbd78c27d4b6e Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 21 Jan 2018 11:25:49 -0800 Subject: [PATCH] Revert "obs-outputs: Fix FMS auth with query string" This reverts commit 5cf11d6726d48cd599ca64a0da169d3fd6f7535a. --- plugins/obs-outputs/librtmp/rtmp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/obs-outputs/librtmp/rtmp.c b/plugins/obs-outputs/librtmp/rtmp.c index 114af9e55..dccad0e74 100644 --- a/plugins/obs-outputs/librtmp/rtmp.c +++ b/plugins/obs-outputs/librtmp/rtmp.c @@ -2526,10 +2526,8 @@ PublisherAuth(RTMP *r, AVal *description) } else if(r->Link.pubUser.av_len && r->Link.pubPasswd.av_len) { - const char *mark = r->Link.app.av_val ? strstr(r->Link.app.av_val, "?") : NULL; pubToken.av_val = malloc(r->Link.pubUser.av_len + av_authmod_adobe.av_len + 8); - pubToken.av_len = sprintf(pubToken.av_val, "%s%s&user=%s", - mark != NULL ? "&" : "?", + pubToken.av_len = sprintf(pubToken.av_val, "?%s&user=%s", av_authmod_adobe.av_val, r->Link.pubUser.av_val); RTMP_Log(RTMP_LOGDEBUG, "%s, pubToken1: %s", __FUNCTION__, pubToken.av_val);