This definition is in two files, since the definitions will move to the private header at the next bump. Signed-off-by: Martin Storsjö <martin@martin.st>tags/n0.10
@@ -146,6 +146,7 @@ typedef struct URLContext { | |||||
} URLContext; | } URLContext; | ||||
#define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */ | #define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */ | ||||
#define URL_PROTOCOL_FLAG_NETWORK 2 /*< The protocol uses network */ | |||||
/** | /** | ||||
* @deprecated This struct is to be made private. Use the higher-level | * @deprecated This struct is to be made private. Use the higher-level | ||||
@@ -121,4 +121,5 @@ URLProtocol ff_gopher_protocol = { | |||||
.url_write = gopher_write, | .url_write = gopher_write, | ||||
.url_close = gopher_close, | .url_close = gopher_close, | ||||
.priv_data_size = sizeof(GopherContext), | .priv_data_size = sizeof(GopherContext), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; |
@@ -565,6 +565,7 @@ URLProtocol ff_http_protocol = { | |||||
.url_get_file_handle = http_get_file_handle, | .url_get_file_handle = http_get_file_handle, | ||||
.priv_data_size = sizeof(HTTPContext), | .priv_data_size = sizeof(HTTPContext), | ||||
.priv_data_class = &http_context_class, | .priv_data_class = &http_context_class, | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; | ||||
#endif | #endif | ||||
#if CONFIG_HTTPS_PROTOCOL | #if CONFIG_HTTPS_PROTOCOL | ||||
@@ -578,6 +579,7 @@ URLProtocol ff_https_protocol = { | |||||
.url_get_file_handle = http_get_file_handle, | .url_get_file_handle = http_get_file_handle, | ||||
.priv_data_size = sizeof(HTTPContext), | .priv_data_size = sizeof(HTTPContext), | ||||
.priv_data_class = &https_context_class, | .priv_data_class = &https_context_class, | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; | ||||
#endif | #endif | ||||
@@ -693,5 +695,6 @@ URLProtocol ff_httpproxy_protocol = { | |||||
.url_close = http_proxy_close, | .url_close = http_proxy_close, | ||||
.url_get_file_handle = http_get_file_handle, | .url_get_file_handle = http_get_file_handle, | ||||
.priv_data_size = sizeof(HTTPContext), | .priv_data_size = sizeof(HTTPContext), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; | ||||
#endif | #endif |
@@ -162,6 +162,7 @@ URLProtocol ff_rtmp_protocol = { | |||||
.url_read_seek = rtmp_read_seek, | .url_read_seek = rtmp_read_seek, | ||||
.url_get_file_handle = rtmp_get_file_handle, | .url_get_file_handle = rtmp_get_file_handle, | ||||
.priv_data_size = sizeof(RTMP), | .priv_data_size = sizeof(RTMP), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; | ||||
URLProtocol ff_rtmpt_protocol = { | URLProtocol ff_rtmpt_protocol = { | ||||
@@ -174,6 +175,7 @@ URLProtocol ff_rtmpt_protocol = { | |||||
.url_read_seek = rtmp_read_seek, | .url_read_seek = rtmp_read_seek, | ||||
.url_get_file_handle = rtmp_get_file_handle, | .url_get_file_handle = rtmp_get_file_handle, | ||||
.priv_data_size = sizeof(RTMP), | .priv_data_size = sizeof(RTMP), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; | ||||
URLProtocol ff_rtmpe_protocol = { | URLProtocol ff_rtmpe_protocol = { | ||||
@@ -186,6 +188,7 @@ URLProtocol ff_rtmpe_protocol = { | |||||
.url_read_seek = rtmp_read_seek, | .url_read_seek = rtmp_read_seek, | ||||
.url_get_file_handle = rtmp_get_file_handle, | .url_get_file_handle = rtmp_get_file_handle, | ||||
.priv_data_size = sizeof(RTMP), | .priv_data_size = sizeof(RTMP), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; | ||||
URLProtocol ff_rtmpte_protocol = { | URLProtocol ff_rtmpte_protocol = { | ||||
@@ -198,6 +201,7 @@ URLProtocol ff_rtmpte_protocol = { | |||||
.url_read_seek = rtmp_read_seek, | .url_read_seek = rtmp_read_seek, | ||||
.url_get_file_handle = rtmp_get_file_handle, | .url_get_file_handle = rtmp_get_file_handle, | ||||
.priv_data_size = sizeof(RTMP), | .priv_data_size = sizeof(RTMP), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; | ||||
URLProtocol ff_rtmps_protocol = { | URLProtocol ff_rtmps_protocol = { | ||||
@@ -210,4 +214,5 @@ URLProtocol ff_rtmps_protocol = { | |||||
.url_read_seek = rtmp_read_seek, | .url_read_seek = rtmp_read_seek, | ||||
.url_get_file_handle = rtmp_get_file_handle, | .url_get_file_handle = rtmp_get_file_handle, | ||||
.priv_data_size = sizeof(RTMP), | .priv_data_size = sizeof(RTMP), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; |
@@ -364,4 +364,5 @@ URLProtocol ff_mmsh_protocol = { | |||||
.url_read = mmsh_read, | .url_read = mmsh_read, | ||||
.url_close = mmsh_close, | .url_close = mmsh_close, | ||||
.priv_data_size = sizeof(MMSHContext), | .priv_data_size = sizeof(MMSHContext), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; |
@@ -625,4 +625,5 @@ URLProtocol ff_mmst_protocol = { | |||||
.url_read = mms_read, | .url_read = mms_read, | ||||
.url_close = mms_close, | .url_close = mms_close, | ||||
.priv_data_size = sizeof(MMSTContext), | .priv_data_size = sizeof(MMSTContext), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; |
@@ -1000,4 +1000,5 @@ URLProtocol ff_rtmp_protocol = { | |||||
.url_write = rtmp_write, | .url_write = rtmp_write, | ||||
.url_close = rtmp_close, | .url_close = rtmp_close, | ||||
.priv_data_size = sizeof(RTMPContext), | .priv_data_size = sizeof(RTMPContext), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; |
@@ -330,4 +330,5 @@ URLProtocol ff_rtp_protocol = { | |||||
.url_close = rtp_close, | .url_close = rtp_close, | ||||
.url_get_file_handle = rtp_get_file_handle, | .url_get_file_handle = rtp_get_file_handle, | ||||
.priv_data_size = sizeof(RTPContext), | .priv_data_size = sizeof(RTPContext), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; |
@@ -204,4 +204,5 @@ URLProtocol ff_tcp_protocol = { | |||||
.url_close = tcp_close, | .url_close = tcp_close, | ||||
.url_get_file_handle = tcp_get_file_handle, | .url_get_file_handle = tcp_get_file_handle, | ||||
.priv_data_size = sizeof(TCPContext), | .priv_data_size = sizeof(TCPContext), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; |
@@ -248,4 +248,5 @@ URLProtocol ff_tls_protocol = { | |||||
.url_write = tls_write, | .url_write = tls_write, | ||||
.url_close = tls_close, | .url_close = tls_close, | ||||
.priv_data_size = sizeof(TLSContext), | .priv_data_size = sizeof(TLSContext), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; |
@@ -491,4 +491,5 @@ URLProtocol ff_udp_protocol = { | |||||
.url_close = udp_close, | .url_close = udp_close, | ||||
.url_get_file_handle = udp_get_file_handle, | .url_get_file_handle = udp_get_file_handle, | ||||
.priv_data_size = sizeof(UDPContext), | .priv_data_size = sizeof(UDPContext), | ||||
.flags = URL_PROTOCOL_FLAG_NETWORK, | |||||
}; | }; |
@@ -33,6 +33,7 @@ | |||||
#if !FF_API_OLD_AVIO | #if !FF_API_OLD_AVIO | ||||
#define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */ | #define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */ | ||||
#define URL_PROTOCOL_FLAG_NETWORK 2 /*< The protocol uses network */ | |||||
extern int (*url_interrupt_cb)(void); | extern int (*url_interrupt_cb)(void); | ||||