generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2'

Browse Source 
* commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2':
  protocols: make the list of protocols static

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-02-29 18:07:41 +00:00
parent 95cdc0a5c6 832a202c47
commit bb8cc89b29
3 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/avio.c
View File

@@ -239,6 +239,7 @@ int ffurl_handshake(URLContext *c)
static const struct URLProtocol *url_find_protocol(const char *filename)
{
const URLProtocol *up;
const URLProtocol **protocols;
char proto_str[128], proto_nested[128], *ptr;
size_t proto_len = strspn(filename, URL_SCHEME_CHARS);
int i;
@@ -257,14 +258,16 @@ static const struct URLProtocol *url_find_protocol(const char *filename)
if ((ptr = strchr(proto_nested, '+')))
*ptr = '\0';
for (i = 0; ff_url_protocols[i]; i++) {
up = ff_url_protocols[i];
protocols = ffurl_get_protocols(NULL, NULL);
for (i = 0; protocols[i]; i++) {
up = protocols[i];
if (!strcmp(proto_str, up->name))
break;
if (up->flags & URL_PROTOCOL_FLAG_NESTED_SCHEME &&
!strcmp(proto_nested, up->name))
break;
}
av_freep(&protocols);
return up;
}