Commit 94aa70d7 authored by Derek Buitenhuis's avatar Derek Buitenhuis

avformat: Rename IPFS to IPFS gateway

It is a URL rewriter for IPFS gateways, not an actual implementation of
IPFS, and naming it as such was both incorrect and misleading.
Signed-off-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parent 5d3f0226
...@@ -31,7 +31,7 @@ version <next>: ...@@ -31,7 +31,7 @@ version <next>:
version 5.1: version 5.1:
- add ipfs/ipns protocol support - add ipfs/ipns gateway support
- dialogue enhance audio filter - dialogue enhance audio filter
- dropped obsolete XvMC hwaccel - dropped obsolete XvMC hwaccel
- pcm-bluray encoder - pcm-bluray encoder
......
...@@ -3601,8 +3601,8 @@ udp_protocol_select="network" ...@@ -3601,8 +3601,8 @@ udp_protocol_select="network"
udplite_protocol_select="network" udplite_protocol_select="network"
unix_protocol_deps="sys_un_h" unix_protocol_deps="sys_un_h"
unix_protocol_select="network" unix_protocol_select="network"
ipfs_protocol_select="https_protocol" ipfs_gateway_protocol_select="https_protocol"
ipns_protocol_select="https_protocol" ipns_gateway_protocol_select="https_protocol"
# external library protocols # external library protocols
libamqp_protocol_deps="librabbitmq" libamqp_protocol_deps="librabbitmq"
......
...@@ -672,8 +672,8 @@ OBJS-$(CONFIG_SRTP_PROTOCOL) += srtpproto.o srtp.o ...@@ -672,8 +672,8 @@ OBJS-$(CONFIG_SRTP_PROTOCOL) += srtpproto.o srtp.o
OBJS-$(CONFIG_SUBFILE_PROTOCOL) += subfile.o OBJS-$(CONFIG_SUBFILE_PROTOCOL) += subfile.o
OBJS-$(CONFIG_TEE_PROTOCOL) += teeproto.o tee_common.o OBJS-$(CONFIG_TEE_PROTOCOL) += teeproto.o tee_common.o
OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
OBJS-$(CONFIG_IPFS_PROTOCOL) += ipfsgateway.o OBJS-$(CONFIG_IPFS_GATEWAY_PROTOCOL) += ipfsgateway.o
OBJS-$(CONFIG_IPNS_PROTOCOL) += ipfsgateway.o OBJS-$(CONFIG_IPNS_GATEWAY_PROTOCOL) += ipfsgateway.o
TLS-OBJS-$(CONFIG_GNUTLS) += tls_gnutls.o TLS-OBJS-$(CONFIG_GNUTLS) += tls_gnutls.o
TLS-OBJS-$(CONFIG_LIBTLS) += tls_libtls.o TLS-OBJS-$(CONFIG_LIBTLS) += tls_libtls.o
TLS-OBJS-$(CONFIG_MBEDTLS) += tls_mbedtls.o TLS-OBJS-$(CONFIG_MBEDTLS) += tls_mbedtls.o
......
...@@ -329,29 +329,29 @@ static const AVOption options[] = { ...@@ -329,29 +329,29 @@ static const AVOption options[] = {
{NULL}, {NULL},
}; };
static const AVClass ipfs_context_class = { static const AVClass ipfs_gateway_context_class = {
.class_name = "IPFS", .class_name = "IPFS Gateway",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
const URLProtocol ff_ipfs_protocol = { const URLProtocol ff_ipfs_gateway_protocol = {
.name = "ipfs", .name = "ipfs",
.url_open2 = translate_ipfs_to_http, .url_open2 = translate_ipfs_to_http,
.url_read = ipfs_read, .url_read = ipfs_read,
.url_seek = ipfs_seek, .url_seek = ipfs_seek,
.url_close = ipfs_close, .url_close = ipfs_close,
.priv_data_size = sizeof(IPFSGatewayContext), .priv_data_size = sizeof(IPFSGatewayContext),
.priv_data_class = &ipfs_context_class, .priv_data_class = &ipfs_gateway_context_class,
}; };
const URLProtocol ff_ipns_protocol = { const URLProtocol ff_ipns_gateway_protocol = {
.name = "ipns", .name = "ipns",
.url_open2 = translate_ipfs_to_http, .url_open2 = translate_ipfs_to_http,
.url_read = ipfs_read, .url_read = ipfs_read,
.url_seek = ipfs_seek, .url_seek = ipfs_seek,
.url_close = ipfs_close, .url_close = ipfs_close,
.priv_data_size = sizeof(IPFSGatewayContext), .priv_data_size = sizeof(IPFSGatewayContext),
.priv_data_class = &ipfs_context_class, .priv_data_class = &ipfs_gateway_context_class,
}; };
...@@ -72,8 +72,8 @@ extern const URLProtocol ff_libsrt_protocol; ...@@ -72,8 +72,8 @@ extern const URLProtocol ff_libsrt_protocol;
extern const URLProtocol ff_libssh_protocol; extern const URLProtocol ff_libssh_protocol;
extern const URLProtocol ff_libsmbclient_protocol; extern const URLProtocol ff_libsmbclient_protocol;
extern const URLProtocol ff_libzmq_protocol; extern const URLProtocol ff_libzmq_protocol;
extern const URLProtocol ff_ipfs_protocol; extern const URLProtocol ff_ipfs_gateway_protocol;
extern const URLProtocol ff_ipns_protocol; extern const URLProtocol ff_ipns_gateway_protocol;
#include "libavformat/protocol_list.c" #include "libavformat/protocol_list.c"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment