Browse Source

avio: Fix handling of filenames that contain :

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.9
Michael Niedermayer 14 years ago
parent
commit
58030fc6c8
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      libavformat/avio.c

+ 3
- 3
libavformat/avio.c View File

@@ -288,17 +288,17 @@ int ffurl_alloc(URLContext **puc, const char *filename, int flags,
{
URLProtocol *up = NULL;
char proto_str[128], proto_nested[128], *ptr;
const char *proto_end = strchr(filename, ':');
size_t proto_len = strspn(filename, URL_SCHEME_CHARS);

if (!first_protocol) {
av_log(NULL, AV_LOG_WARNING, "No URL Protocols are registered. "
"Missing call to av_register_all()?\n");
}

if (!proto_end || is_dos_path(filename))
if (filename[proto_len] != ':' && filename[proto_len] != ',' || is_dos_path(filename))
strcpy(proto_str, "file");
else
av_strlcpy(proto_str, filename, FFMIN(proto_end-filename+1, sizeof(proto_str)));
av_strlcpy(proto_str, filename, FFMIN(proto_len+1, sizeof(proto_str)));

if ((ptr = strchr(proto_str, ',')))
*ptr = '\0';


Loading…
Cancel
Save