From fe3fed0b143ef6bf2d9b65ce05d55aba4224429e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 30 Jan 2016 02:17:51 +0100 Subject: Update demuxers and protocols for protocol whitelist support Reviewed-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer --- libavformat/concat.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libavformat/concat.c') diff --git a/libavformat/concat.c b/libavformat/concat.c index 7bcc27905e..7a8eb1be9e 100644 --- a/libavformat/concat.c +++ b/libavformat/concat.c @@ -97,8 +97,9 @@ static av_cold int concat_open(URLContext *h, const char *uri, int flags) uri += len + strspn(uri + len, AV_CAT_SEPARATOR); /* creating URLContext */ - if ((err = ffurl_open(&uc, node_uri, flags, - &h->interrupt_callback, NULL)) < 0) + err = ffurl_open_whitelist(&uc, node_uri, flags, + &h->interrupt_callback, NULL, h->protocol_whitelist); + if (err < 0) break; /* creating size */ @@ -192,4 +193,5 @@ URLProtocol ff_concat_protocol = { .url_seek = concat_seek, .url_close = concat_close, .priv_data_size = sizeof(struct concat_data), + .default_whitelist = "concat,file,subfile", }; -- cgit v1.2.3