[FFmpeg-cvslog] avio: Apply avoptions on the URLContext itself as well

Martin Storsjö git at videolan.org
Mon Apr 18 16:36:24 CEST 2016


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sat Feb 28 01:17:09 2015 +0200| [d44f3e4059506a182f59218b1e967d42b01e097c] | committer: Martin Storsjö

avio: Apply avoptions on the URLContext itself as well

Currently the list of avoptions for URLContext is empty though,
but such options will be added.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

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

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 668e5ea..4da6b74 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -176,6 +176,9 @@ int ffurl_open(URLContext **puc, const char *filename, int flags,
     int ret = ffurl_alloc(puc, filename, flags, int_cb, protocols);
     if (ret)
         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;



More information about the ffmpeg-cvslog mailing list