Skip to content

Commit

Permalink
ijkavformat: Forward whitelists option to protocols
Browse files Browse the repository at this point in the history
  • Loading branch information
xinzhengzhang committed Mar 29, 2016
1 parent c33b20d commit 6c6aa6b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ijkmedia/ijkplayer/ijkavformat/async.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ static int async_open(URLContext *h, const char *arg, int flags, AVDictionary **

/* wrap interrupt callback */
c->interrupt_callback = h->interrupt_callback;
av_dict_set(options, "protocol-whitelist", h->protocol_whitelist, 0);

ret = ffurl_open(&c->inner, arg, flags, &interrupt_callback, options);
if (ret != 0) {
av_log(h, AV_LOG_ERROR, "ffurl_open failed : %s, %s\n", av_err2str(ret), arg);
Expand Down
2 changes: 2 additions & 0 deletions ijkmedia/ijkplayer/ijkavformat/ijkinject.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ static int ijkinject_open(URLContext *h, const char *arg, int flags, AVDictionar

av_dict_set_int(options, "ijkinject-opaque", c->opaque, 0);
av_dict_set_int(options, "ijkinject-segment-index", c->segment_index, 0);
av_dict_set(options, "protocol-whitelist", h->protocol_whitelist, 0);

ret = ffurl_open(&c->inner, arg, flags, &h->interrupt_callback, options);
if (ret)
goto fail;
Expand Down
2 changes: 2 additions & 0 deletions ijkmedia/ijkplayer/ijkavformat/ijklivehook.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ static int open_inner(AVFormatContext *avf)
av_dict_copy(&tmp_opts, c->open_opts, 0);

new_avf->interrupt_callback = avf->interrupt_callback;
av_dict_set(&tmp_opts, "protocol-whitelist", avf->protocol_whitelist, 0);

ret = avformat_open_input(&new_avf, c->inject_data.url, NULL, &tmp_opts);
if (ret < 0)
goto fail;
Expand Down
1 change: 1 addition & 0 deletions ijkmedia/ijkplayer/ijkavformat/ijklongurl.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ static int ijklongurl_open(URLContext *h, const char *arg, int flags, AVDictiona

if (!c->url || !*c->url)
return AVERROR_EXTERNAL;
av_dict_set(options, "protocol-whitelist", h->protocol_whitelist, 0);

return ffurl_open(&c->inner, c->url, flags, &h->interrupt_callback, options);
}
Expand Down
1 change: 1 addition & 0 deletions ijkmedia/ijkplayer/ijkavformat/ijksegment.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ static int ijksegment_open(URLContext *h, const char *arg, int flags, AVDictiona

av_dict_set_int(options, "ijkinject-opaque", c->opaque, 0);
av_dict_set_int(options, "ijkinject-segment-index", c->segment_index, 0);
av_dict_set(options, "protocol-whitelist", h->protocol_whitelist, 0);

ret = ffurl_open(&c->inner, inject_data.url, flags, &h->interrupt_callback, options);
if (ret)
Expand Down
2 changes: 2 additions & 0 deletions ijkmedia/ijkplayer/ijkavformat/ijkurlhook.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ static int ijkurlhook_reconnect(URLContext *h, AVDictionary *extra)

assert(c->inner_options);
av_dict_copy(&inner_options, c->inner_options, 0);
av_dict_set(&inner_options, "protocol-whitelist", h->protocol_whitelist, 0);

if (extra)
av_dict_copy(&inner_options, extra, 0);

Expand Down

0 comments on commit 6c6aa6b

Please sign in to comment.