diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-02-19 10:39:29 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-02-22 11:30:58 +0100 |
| commit | 2758cdedfb7ac61f8b5e4861f99218b6fd43491d (patch) | |
| tree | 7280b43fe38dff1db077ffd8ebfeabbb850718d4 /libavformat/http.c | |
| parent | 225e84e74544062706c0159ec0737b0e1d40915f (diff) | |
| download | ffmpeg-2758cdedfb7ac61f8b5e4861f99218b6fd43491d.tar.gz | |
lavf: reorganize URLProtocols
Instead of a linked list constructed at av_register_all(), store them
in a constant array of pointers.
Since no registration is necessary now, this removes some global state
from lavf. This will also allow the urlprotocol layer caller to limit
the available protocols in a simple and flexible way in the following
commits.
Diffstat (limited to 'libavformat/http.c')
| -rw-r--r-- | libavformat/http.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index b3e9771757..6886e151a1 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1013,7 +1013,7 @@ static const AVClass flavor ## _context_class = { \ #if CONFIG_HTTP_PROTOCOL HTTP_CLASS(http); -URLProtocol ff_http_protocol = { +const URLProtocol ff_http_protocol = { .name = "http", .url_open2 = http_open, .url_read = http_read, @@ -1031,7 +1031,7 @@ URLProtocol ff_http_protocol = { #if CONFIG_HTTPS_PROTOCOL HTTP_CLASS(https); -URLProtocol ff_https_protocol = { +const URLProtocol ff_https_protocol = { .name = "https", .url_open2 = http_open, .url_read = http_read, @@ -1142,7 +1142,7 @@ static int http_proxy_write(URLContext *h, const uint8_t *buf, int size) return ffurl_write(s->hd, buf, size); } -URLProtocol ff_httpproxy_protocol = { +const URLProtocol ff_httpproxy_protocol = { .name = "httpproxy", .url_open = http_proxy_open, .url_read = http_buf_read, |