Merge commit '249827f736db4c94dfcb24a3883aa4c04f9b119b'

[ffmpeg] / libavformat / crypto.c

diff --git a/libavformat/crypto.c b/libavformat/crypto.c
index f56ee4eb17c2e114cb15f9c34af55f493af2ca90..b1871fe9744ec3c24f7c284632c9cf9028413936 100644 (file)
--- a/libavformat/crypto.c
+++ b/libavformat/crypto.c
@@ -136,8 +136,9 @@ static int crypto_open2(URLContext *h, const char *uri, int flags, AVDictionary
             goto err;
     }
 
-    if ((ret = ffurl_open(&c->hd, nested_url, flags,
-                          &h->interrupt_callback, options)) < 0) {
+    if ((ret = ffurl_open_whitelist(&c->hd, nested_url, flags,
+                                    &h->interrupt_callback, options,
+                                    h->protocol_whitelist)) < 0) {
         av_log(h, AV_LOG_ERROR, "Unable to open resource: %s\n", nested_url);
         goto err;
     }