[FFmpeg-cvslog] Merge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Apr 18 15:35:12 2016 +0100| [4eef36a4f6db1feb9d628337bd96e07a9b482c1a] | committer: Derek Buitenhuis

Merge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'

* commit 'd44f3e4059506a182f59218b1e967d42b01e097c':
  avio: Apply avoptions on the URLContext itself as well

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4eef36a4f6db1feb9d628337bd96e07a9b482c1a
---

 libavformat/avio.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 6bfa67f..4b10dd8 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -311,6 +311,9 @@ int ffurl_open_whitelist(URLContext **puc, const char *filename, int flags,
     int ret = ffurl_alloc(puc, filename, flags, int_cb);
     if (ret < 0)
         return ret;
+    if (options &&
+        (ret = av_opt_set_dict(*puc, options)) < 0)
+        goto fail;
     if (options && (*puc)->prot->priv_data_class &&
         (ret = av_opt_set_dict((*puc)->priv_data, options)) < 0)
         goto fail;


======================================================================

diff --cc libavformat/avio.c
index 6bfa67f,4da6b74..4b10dd8
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@@ -302,15 -169,16 +302,18 @@@ int ffurl_alloc(URLContext **puc, cons
      return AVERROR_PROTOCOL_NOT_FOUND;
  }
  
 -int ffurl_open(URLContext **puc, const char *filename, int flags,
 -               const AVIOInterruptCB *int_cb, AVDictionary **options,
 -               const URLProtocol **protocols)
 +int ffurl_open_whitelist(URLContext **puc, const char *filename, int flags,
 +                         const AVIOInterruptCB *int_cb, AVDictionary **options,
 +                         const char *whitelist, const char* blacklist)
  {
 -    int ret = ffurl_alloc(puc, filename, flags, int_cb, protocols);
 -    if (ret)
 +    AVDictionary *tmp_opts = NULL;
 +    AVDictionaryEntry *e;
 +    int ret = ffurl_alloc(puc, filename, flags, int_cb);
 +    if (ret < 0)
          return ret;
+     if (options &&
+         (ret = av_opt_set_dict(*puc, options)) < 0)
+         goto fail;
      if (options && (*puc)->prot->priv_data_class &&
          (ret = av_opt_set_dict((*puc)->priv_data, options)) < 0)
          goto fail;