[FFmpeg-cvslog] crypto should allow passing of options to the underlying protocol via the url_open2 interface

[Duncan Salerno]

ffmpeg | branch: master | Duncan Salerno <duncan.salerno at gmail.com> | Tue Oct  9 19:13:14 2012 +0100| [f3f35f7430f1156a13532eb32b7162c62c819d3a] | committer: Michael Niedermayer

crypto should allow passing of options to the underlying protocol via the url_open2 interface

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

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

 libavformat/crypto.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/crypto.c b/libavformat/crypto.c
index 93c9f23..06c687e 100644
--- a/libavformat/crypto.c
+++ b/libavformat/crypto.c
@@ -59,7 +59,7 @@ static const AVClass crypto_class = {
     .version        = LIBAVUTIL_VERSION_INT,
 };
 
-static int crypto_open(URLContext *h, const char *uri, int flags)
+static int crypto_open2(URLContext *h, const char *uri, int flags, AVDictionary **options)
 {
     const char *nested_url;
     int ret = 0;
@@ -83,7 +83,7 @@ static int crypto_open(URLContext *h, const char *uri, int flags)
         goto err;
     }
     if ((ret = ffurl_open(&c->hd, nested_url, AVIO_FLAG_READ,
-                          &h->interrupt_callback, NULL)) < 0) {
+                          &h->interrupt_callback, options)) < 0) {
         av_log(h, AV_LOG_ERROR, "Unable to open input\n");
         goto err;
     }
@@ -161,7 +161,7 @@ static int crypto_close(URLContext *h)
 
 URLProtocol ff_crypto_protocol = {
     .name            = "crypto",
-    .url_open        = crypto_open,
+    .url_open2       = crypto_open2,
     .url_read        = crypto_read,
     .url_close       = crypto_close,
     .priv_data_size  = sizeof(CryptoContext),