Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'

* commit 'fab8156b2f30666adabe227b3d7712fd193873b1':
  avio: Copy URLContext generic options into child URLContexts

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/libavformat/subfile.c b/libavformat/subfile.c
index fdd328a084..fa971e1902 100644
--- a/libavformat/subfile.c
+++ b/libavformat/subfile.c
@@ -78,7 +78,7 @@ static int subfile_open(URLContext *h, const char *filename, int flags,
     }
     av_strstart(filename, "subfile:", &filename);
     ret = ffurl_open_whitelist(&c->h, filename, flags, &h->interrupt_callback,
-                               options, h->protocol_whitelist, h->protocol_blacklist);
+                               options, h->protocol_whitelist, h->protocol_blacklist, h);
     if (ret < 0)
         return ret;
     c->pos = c->start;