summaryrefslogtreecommitdiff
path: root/libavformat/applehttp.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-11-05 10:04:04 +0100
committerAnton Khirnov <anton@khirnov.net>2011-11-13 13:14:39 +0100
commitddffc2fdc351d60ca190b016cccff4acff27823f (patch)
treebabe7cbc4ebf1c48d680236cafdcb82999e64945 /libavformat/applehttp.c
parent163a31136dcb0b5966fc779917e0408cb52d7295 (diff)
avio: add support for passing options to protocols.
Not used anywhere yet, support for passing options from avio_open() will follow.
Diffstat (limited to 'libavformat/applehttp.c')
-rw-r--r--libavformat/applehttp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c
index ae251531e8..74d9f781e3 100644
--- a/libavformat/applehttp.c
+++ b/libavformat/applehttp.c
@@ -324,14 +324,14 @@ static int open_input(struct variant *var)
struct segment *seg = var->segments[var->cur_seq_no - var->start_seq_no];
if (seg->key_type == KEY_NONE) {
return ffurl_open(&var->input, seg->url, AVIO_FLAG_READ,
- &var->parent->interrupt_callback);
+ &var->parent->interrupt_callback, NULL);
} else if (seg->key_type == KEY_AES_128) {
char iv[33], key[33], url[MAX_URL_SIZE];
int ret;
if (strcmp(seg->key, var->key_url)) {
URLContext *uc;
if (ffurl_open(&uc, seg->key, AVIO_FLAG_READ,
- &var->parent->interrupt_callback) == 0) {
+ &var->parent->interrupt_callback, NULL) == 0) {
if (ffurl_read_complete(uc, var->key, sizeof(var->key))
!= sizeof(var->key)) {
av_log(NULL, AV_LOG_ERROR, "Unable to read key file %s\n",
@@ -356,7 +356,7 @@ static int open_input(struct variant *var)
return ret;
av_opt_set(var->input->priv_data, "key", key, 0);
av_opt_set(var->input->priv_data, "iv", iv, 0);
- if ((ret = ffurl_connect(var->input)) < 0) {
+ if ((ret = ffurl_connect(var->input, NULL)) < 0) {
ffurl_close(var->input);
var->input = NULL;
return ret;