highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '7ce3bd9614717e545af8fb8455032c807e389b78'

Browse Source 
* commit '7ce3bd9614717e545af8fb8455032c807e389b78':
  rtmpproto: Support alternative slist parameter in rtmp URLs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-07 00:39:26 +02:00
commit d68ed9f257
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/rtmpproto.c
View File

@ -2380,7 +2380,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
{ {
RTMPContext *rt = s->priv_data; RTMPContext *rt = s->priv_data;
char proto[8], hostname[256], path[1024], auth[100], *fname; char proto[8], hostname[256], path[1024], auth[100], *fname;
char *old_app; char *old_app, *qmark, fname_buffer[1024];
uint8_t buf[2048]; uint8_t buf[2048];
int port; int port;
AVDictionary *opts = NULL; AVDictionary *opts = NULL;
@ -2478,7 +2478,19 @@ reconnect:
} }
//extract "app" part from path //extract "app" part from path
if (!strncmp(path, "/ondemand/", 10)) { qmark = strchr(path, '?');
if (qmark && strstr(qmark, "slist=")) {
char* amp;
// After slist we have the playpath, before the params, the app
av_strlcpy(rt->app, path + 1, qmark - path);
fname = strstr(path, "slist=") + 6;
// Strip any further query parameters from fname
amp = strchr(fname, '&');
if (amp) {
av_strlcpy(fname_buffer, fname, amp - fname + 1);
fname = fname_buffer;
}
} else if (!strncmp(path, "/ondemand/", 10)) {
fname = path + 10; fname = path + 10;
memcpy(rt->app, "ondemand", 9); memcpy(rt->app, "ondemand", 9);
} else { } else {