videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

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> @ <gmx> . <net>)

Originally committed as revision 19894 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Lars Täuber 2009-09-17 05:31:02 +00:00 committed by Kostya Shishkov
parent 609782970c
commit f68c8a5039
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/rtmpproto.c
View File

@ -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;