diff options
| author | Duncan Salerno <duncan.salerno@gmail.com> | 2012-10-09 19:13:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-09 22:52:25 +0200 |
| commit | f3f35f7430f1156a13532eb32b7162c62c819d3a (patch) | |
| tree | 1a986409f69c3b94c88617d939895ea76ba93514 | |
| parent | 6ac5e3fe9d92c385ccae89d914b03e3bbc288698 (diff) | |
| download | ffmpeg-f3f35f7430f1156a13532eb32b7162c62c819d3a.tar.gz | |
crypto should allow passing of options to the underlying protocol via the url_open2 interface
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/crypto.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/crypto.c b/libavformat/crypto.c index 93c9f23f68..06c687e3fc 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), |