From f68c8a50391802c0fca81e09de48df557f528c25 Mon Sep 17 00:00:00 2001 From: Lars Täuber Date: Thu, 17 Sep 2009 05:31:02 +0000 Subject: Do not include "mp4:" prefix from RTMP URL into "app" path or second time into playpath. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by Lars Täuber (<$name> . <$lastname with umlaut replaced with diphtong> @ . ) Originally committed as revision 19894 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtmpproto.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libavformat/rtmpproto.c') diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 470e6fef87..55bd99033d 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -611,8 +611,9 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) 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 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) } } } - 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; -- cgit v1.2.3