[FFmpeg-cvslog] avformat/avio: also set generic URL context options

Michael Niedermayer git at videolan.org
Sun Mar 30 15:20:48 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 30 14:51:59 2014 +0200| [7aa3979b8c2068ae3a352ecb5a92168aca311932] | committer: Michael Niedermayer

avformat/avio: also set generic URL context options

This should have no effect currently as there are no such options yet.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavformat/avio.c b/libavformat/avio.c
index e366dfa..4edaaa6 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -275,6 +275,8 @@ int ffurl_open(URLContext **puc, const char *filename, int flags,
     if (options && (*puc)->prot->priv_data_class &&
         (ret = av_opt_set_dict((*puc)->priv_data, options)) < 0)
         goto fail;
+    if ((ret = av_opt_set_dict(*puc, options)) < 0)
+        goto fail;
     ret = ffurl_connect(*puc, options);
     if (!ret)
         return 0;



More information about the ffmpeg-cvslog mailing list