apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-04-23 16:13:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-04-21 15:55:09 +01:00
parent be5fde92ff fab8156b2f
commit f8e89d8a29
25 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/crypto.c
+1 -1
View File
@@ -138,7 +138,7 @@ static int crypto_open2(URLContext *h, const char *uri, int flags, AVDictionary
if ((ret = ffurl_open_whitelist(&c->hd, nested_url, flags,
&h->interrupt_callback, options,
h->protocol_whitelist, h->protocol_blacklist)) < 0) {
h->protocol_whitelist, h->protocol_blacklist, h)) < 0) {
av_log(h, AV_LOG_ERROR, "Unable to open resource: %s\n", nested_url);
goto err;
}