diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:50:39 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:51:10 +0000 |
| commit | 9c75148e6ebc88a0501e3d0242defb6dbdc3c23d (patch) | |
| tree | e24939addbed549191606f8b6927b29b42c18394 /libavformat/http.c | |
| parent | e3461197b1ffa0b4ebb80ee3d8567d3b286d7fc3 (diff) | |
| parent | 2758cdedfb7ac61f8b5e4861f99218b6fd43491d (diff) | |
| download | ffmpeg-9c75148e6ebc88a0501e3d0242defb6dbdc3c23d.tar.gz | |
Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'
This commit also disables the async fate test, because it
used internal APIs in a non-kosher way, which no longer
exists.
* commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d':
lavf: reorganize URLProtocols
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
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 d1b91e23d6..a4ce479e34 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1508,7 +1508,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_accept = http_accept, @@ -1529,7 +1529,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, @@ -1644,7 +1644,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, |