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

41
libavformat/protocols.c
View File

@@ -18,6 +18,9 @@
#include "config.h"
#include "libavutil/avstring.h"
#include "libavutil/mem.h"
#include "url.h"
extern const URLProtocol ff_async_protocol;
@@ -66,7 +69,7 @@ extern const URLProtocol ff_librtmpte_protocol;
extern const URLProtocol ff_libssh_protocol;
extern const URLProtocol ff_libsmbclient_protocol;
const URLProtocol *ff_url_protocols[] = {
static const URLProtocol *url_protocols[] = {
#if CONFIG_ASYNC_PROTOCOL
&ff_async_protocol,
#endif
@@ -212,17 +215,17 @@ const AVClass *ff_urlcontext_child_class_next(const AVClass *prev)
int i;
/* find the protocol that corresponds to prev */
for (i = 0; ff_url_protocols[i]; i++) {
if (ff_url_protocols[i]->priv_data_class == prev) {
for (i = 0; url_protocols[i]; i++) {
if (url_protocols[i]->priv_data_class == prev) {
i++;
break;
}
}
/* find next protocol with priv options */
for (; ff_url_protocols[i]; i++)
if (ff_url_protocols[i]->priv_data_class)
return ff_url_protocols[i]->priv_data_class;
for (; url_protocols[i]; i++)
if (url_protocols[i]->priv_data_class)
return url_protocols[i]->priv_data_class;
return NULL;
}
@@ -231,7 +234,7 @@ const char *avio_enum_protocols(void **opaque, int output)
{
const URLProtocol **p = *opaque;
p = p ? p + 1 : ff_url_protocols;
p = p ? p + 1 : url_protocols;
*opaque = p;
if (!*p) {
*opaque = NULL;
@@ -241,3 +244,27 @@ const char *avio_enum_protocols(void **opaque, int output)
return (*p)->name;
return avio_enum_protocols(opaque, output);
}
const URLProtocol **ffurl_get_protocols(const char *whitelist,
const char *blacklist)
{
const URLProtocol **ret;
int i, ret_idx = 0;
ret = av_mallocz_array(FF_ARRAY_ELEMS(url_protocols), sizeof(*ret));
if (!ret)
return NULL;
for (i = 0; url_protocols[i]; i++) {
const URLProtocol *up = url_protocols[i];
if (whitelist && *whitelist && !av_match_name(up->name, whitelist))
continue;
if (blacklist && *blacklist && av_match_name(up->name, blacklist))
continue;
ret[ret_idx++] = up;
}
return ret;
}