ffmpeg | branch: master | Martin Storsjö <mar...@martin.st> | Sat Feb 28 02:15:55 2015 +0200| [b9d2d6843a49f9df1d1ae1afe817d9b48c445919] | committer: Martin Storsjö
tls: Pass AVOptions dictionaries through to the chained protocol Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9d2d6843a49f9df1d1ae1afe817d9b48c445919 --- libavformat/tls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/tls.c b/libavformat/tls.c index 1832f2b..d5de5ee 100644 --- a/libavformat/tls.c +++ b/libavformat/tls.c @@ -137,7 +137,7 @@ static int do_tls_poll(URLContext *h, int ret) return 0; } -static int tls_open(URLContext *h, const char *uri, int flags) +static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **options) { TLSContext *c = h->priv_data; int ret; @@ -189,7 +189,7 @@ static int tls_open(URLContext *h, const char *uri, int flags) } ret = ffurl_open(&c->tcp, buf, AVIO_FLAG_READ_WRITE, - &h->interrupt_callback, NULL); + &h->interrupt_callback, options); if (ret) goto fail; c->fd = ffurl_get_file_handle(c->tcp); @@ -360,7 +360,7 @@ static int tls_close(URLContext *h) URLProtocol ff_tls_protocol = { .name = "tls", - .url_open = tls_open, + .url_open2 = tls_open, .url_read = tls_read, .url_write = tls_write, .url_close = tls_close, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
