jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-outputs: Fix stuck "Connecting" with no key

Browse Source 
With no stream key, no streams were actually being created.
This is a crazy configuration anyway, but it resulted in OBS getting
stuck in the "Connecting" state with no way to cancel.
We now just use the blank key and hope for the best.
This commit is contained in:
Jess Mayo 2015-07-11 14:01:11 +09:00
parent 1682d77df3
commit cec88d2897
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/obs-outputs/librtmp/parseurl.c
View File

@ -177,6 +177,9 @@ void RTMP_ParsePlaypath(AVal *in, AVal *out)
out->av_val = NULL;
out->av_len = 0;
if (!playpath)
return;
if ((*ppstart == '?') &&
(temp=strstr(ppstart, "slist=")) != 0)
{

13
plugins/obs-outputs/librtmp/rtmp.c
View File

@ -633,16 +633,13 @@ int RTMP_SetupURL(RTMP *r, char *url)
int RTMP_AddStream(RTMP *r, const char *playpath)
{
int idx = -1;
AVal pp = { (char*)playpath, playpath?(int)strlen(playpath):0 };
if (playpath && *playpath)
{
AVal pp = {(char*)playpath, (int)strlen(playpath)};
RTMP_ParsePlaypath(&pp, &r->Link.streams[r->Link.nStreams].playpath);
r->Link.streams[r->Link.nStreams].id = -1;
RTMP_ParsePlaypath(&pp, &r->Link.streams[r->Link.nStreams].playpath);
r->Link.streams[r->Link.nStreams].id = -1;
idx = r->Link.nStreams;
r->Link.nStreams++;
}
idx = r->Link.nStreams;
r->Link.nStreams++;
return idx;
}