diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-11-05 12:54:01 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-11-10 11:36:45 +0100 |
| commit | 3b384502f2950dd8f172060bfa74447a665af6d9 (patch) | |
| tree | a02f3e5aca0432cd4b33ec2506e4f050aa09441b /libavformat/http.c | |
| parent | 8ef79f42cadb0f6eefb033c62422d4c87f260cda (diff) | |
http: use different classes for http and https.
Diffstat (limited to 'libavformat/http.c')
| -rw-r--r-- | libavformat/http.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 783ac6ab78..5c47f1dd60 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -57,13 +57,17 @@ static const AVOption options[] = { {"headers", "custom HTTP headers, can override built in default headers", OFFSET(headers), AV_OPT_TYPE_STRING }, {NULL} }; -static const AVClass httpcontext_class = { - .class_name = "HTTP", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, +#define HTTP_CLASS(flavor)\ +static const AVClass flavor ## _context_class = {\ + .class_name = #flavor,\ + .item_name = av_default_item_name,\ + .option = options,\ + .version = LIBAVUTIL_VERSION_INT,\ }; +HTTP_CLASS(http); +HTTP_CLASS(https); + static int http_connect(URLContext *h, const char *path, const char *hoststr, const char *auth, int *new_location); @@ -518,7 +522,7 @@ URLProtocol ff_http_protocol = { .url_close = http_close, .url_get_file_handle = http_get_file_handle, .priv_data_size = sizeof(HTTPContext), - .priv_data_class = &httpcontext_class, + .priv_data_class = &http_context_class, }; #endif #if CONFIG_HTTPS_PROTOCOL @@ -531,6 +535,6 @@ URLProtocol ff_https_protocol = { .url_close = http_close, .url_get_file_handle = http_get_file_handle, .priv_data_size = sizeof(HTTPContext), - .priv_data_class = &httpcontext_class, + .priv_data_class = &https_context_class, }; #endif |