Merge commit 'c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1'

[ffmpeg] / libavformat / concat.c

diff --git a/libavformat/concat.c b/libavformat/concat.c
index 7bcc27905e61cad9e776ea13f4f3234d0f95cc8f..7a8eb1be9efbbacb2a618fb7ff8d5811ff136ca6 100644 (file)
--- 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",
 };