# HG changeset patch # User kostya # Date 1253165462 0 # Node ID dd04eacd063b336da75ff16afad20e235a9ab6e5 # Parent d7558c9ed907c766b770dd8a184025cbbf03b91a Do not include "mp4:" prefix from RTMP URL into "app" path or second time into playpath. Patch by Lars T¸«£uber (<$name> . <$lastname with umlaut replaced with diphtong> @ . ) diff -r d7558c9ed907 -r dd04eacd063b rtmpproto.c --- a/rtmpproto.c Wed Sep 16 20:44:26 2009 +0000 +++ b/rtmpproto.c Thu Sep 17 05:31:02 2009 +0000 @@ -611,8 +611,9 @@ fname = path + 1; app[0] = '\0'; } else { + char *c = strchr(p + 1, ':'); fname = strchr(p + 1, '/'); - if (!fname) { + if (!fname || c < fname) { fname = p + 1; av_strlcpy(app, path + 1, p - path); } else { @@ -621,8 +622,9 @@ } } } - if (!strcmp(fname + strlen(fname) - 4, ".f4v") || - !strcmp(fname + strlen(fname) - 4, ".mp4")) { + if (!strchr(fname, ':') && + (!strcmp(fname + strlen(fname) - 4, ".f4v") || + !strcmp(fname + strlen(fname) - 4, ".mp4"))) { memcpy(rt->playpath, "mp4:", 5); } else { rt->playpath[0] = 0;