summaryrefslogtreecommitdiff
path: root/libavformat/subfile.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-01-30 02:17:51 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-02-02 04:16:50 +0100
commitfe3fed0b143ef6bf2d9b65ce05d55aba4224429e (patch)
tree45ead8f324a1e5190ea4905cb574325a3d9196bd /libavformat/subfile.c
parent1dba8371d93cf1c83bcd5c432d921905206a60f3 (diff)
Update demuxers and protocols for protocol whitelist support
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/subfile.c')
-rw-r--r--libavformat/subfile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/subfile.c b/libavformat/subfile.c
index 0e84384600..2b53438caf 100644
--- a/libavformat/subfile.c
+++ b/libavformat/subfile.c
@@ -77,7 +77,8 @@ static int subfile_open(URLContext *h, const char *filename, int flags,
return AVERROR(EINVAL);
}
av_strstart(filename, "subfile:", &filename);
- ret = ffurl_open(&c->h, filename, flags, &h->interrupt_callback, options);
+ ret = ffurl_open_whitelist(&c->h, filename, flags, &h->interrupt_callback,
+ options, h->protocol_whitelist);
if (ret < 0)
return ret;
c->pos = c->start;
@@ -144,4 +145,5 @@ URLProtocol ff_subfile_protocol = {
.url_close = subfile_close,
.priv_data_size = sizeof(SubfileContext),
.priv_data_class = &subfile_class,
+ .default_whitelist = "file",
};