summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog2
-rwxr-xr-xconfigure4
-rw-r--r--libavformat/Makefile4
-rw-r--r--libavformat/ipfsgateway.c12
-rw-r--r--libavformat/protocols.c4
5 files changed, 13 insertions, 13 deletions
diff --git a/Changelog b/Changelog
index f3a6abb9cd..179f63c7d5 100644
--- a/Changelog
+++ b/Changelog
@@ -31,7 +31,7 @@ version <next>:
version 5.1:
-- add ipfs/ipns protocol support
+- add ipfs/ipns gateway support
- dialogue enhance audio filter
- dropped obsolete XvMC hwaccel
- pcm-bluray encoder
diff --git a/configure b/configure
index 870d426b0e..df69d39669 100755
--- a/configure
+++ b/configure
@@ -3601,8 +3601,8 @@ udp_protocol_select="network"
udplite_protocol_select="network"
unix_protocol_deps="sys_un_h"
unix_protocol_select="network"
-ipfs_protocol_select="https_protocol"
-ipns_protocol_select="https_protocol"
+ipfs_gateway_protocol_select="https_protocol"
+ipns_gateway_protocol_select="https_protocol"
# external library protocols
libamqp_protocol_deps="librabbitmq"
diff --git a/libavformat/Makefile b/libavformat/Makefile
index d7f198bf39..2699409e43 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -672,8 +672,8 @@ OBJS-$(CONFIG_SRTP_PROTOCOL) += srtpproto.o srtp.o
OBJS-$(CONFIG_SUBFILE_PROTOCOL) += subfile.o
OBJS-$(CONFIG_TEE_PROTOCOL) += teeproto.o tee_common.o
OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
-OBJS-$(CONFIG_IPFS_PROTOCOL) += ipfsgateway.o
-OBJS-$(CONFIG_IPNS_PROTOCOL) += ipfsgateway.o
+OBJS-$(CONFIG_IPFS_GATEWAY_PROTOCOL) += ipfsgateway.o
+OBJS-$(CONFIG_IPNS_GATEWAY_PROTOCOL) += ipfsgateway.o
TLS-OBJS-$(CONFIG_GNUTLS) += tls_gnutls.o
TLS-OBJS-$(CONFIG_LIBTLS) += tls_libtls.o
TLS-OBJS-$(CONFIG_MBEDTLS) += tls_mbedtls.o
diff --git a/libavformat/ipfsgateway.c b/libavformat/ipfsgateway.c
index ce69d9055a..9c0d461099 100644
--- a/libavformat/ipfsgateway.c
+++ b/libavformat/ipfsgateway.c
@@ -329,29 +329,29 @@ static const AVOption options[] = {
{NULL},
};
-static const AVClass ipfs_context_class = {
- .class_name = "IPFS",
+static const AVClass ipfs_gateway_context_class = {
+ .class_name = "IPFS Gateway",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
-const URLProtocol ff_ipfs_protocol = {
+const URLProtocol ff_ipfs_gateway_protocol = {
.name = "ipfs",
.url_open2 = translate_ipfs_to_http,
.url_read = ipfs_read,
.url_seek = ipfs_seek,
.url_close = ipfs_close,
.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",
.url_open2 = translate_ipfs_to_http,
.url_read = ipfs_read,
.url_seek = ipfs_seek,
.url_close = ipfs_close,
.priv_data_size = sizeof(IPFSGatewayContext),
- .priv_data_class = &ipfs_context_class,
+ .priv_data_class = &ipfs_gateway_context_class,
};
diff --git a/libavformat/protocols.c b/libavformat/protocols.c
index 8b7d1b940f..d3a7d4310b 100644
--- a/libavformat/protocols.c
+++ b/libavformat/protocols.c
@@ -72,8 +72,8 @@ extern const URLProtocol ff_libsrt_protocol;
extern const URLProtocol ff_libssh_protocol;
extern const URLProtocol ff_libsmbclient_protocol;
extern const URLProtocol ff_libzmq_protocol;
-extern const URLProtocol ff_ipfs_protocol;
-extern const URLProtocol ff_ipns_protocol;
+extern const URLProtocol ff_ipfs_gateway_protocol;
+extern const URLProtocol ff_ipns_gateway_protocol;
#include "libavformat/protocol_list.c"