[FFmpeg-cvslog] avformat/gopher: Add default_whitelist to ff_gopher_protocol
parazyd
git at videolan.org
Fri Mar 12 01:13:26 EET 2021
ffmpeg | branch: master | parazyd <parazyd at dyne.org> | Sun Feb 28 23:47:03 2021 +0100| [ed4c2e183bc61414abb421b2bf19ac44e436da06] | committer: Marton Balint
avformat/gopher: Add default_whitelist to ff_gopher_protocol
Signed-off-by: parazyd <parazyd at dyne.org>
Signed-off-by: Marton Balint <cus at passwd.hu>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed4c2e183bc61414abb421b2bf19ac44e436da06
---
configure | 2 +-
libavformat/gopher.c | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index d11942fced..1c0888ffa6 100755
--- a/configure
+++ b/configure
@@ -3449,7 +3449,7 @@ ffrtmpcrypt_protocol_select="tcp_protocol"
ffrtmphttp_protocol_conflict="librtmp_protocol"
ffrtmphttp_protocol_select="http_protocol"
ftp_protocol_select="tcp_protocol"
-gopher_protocol_select="network"
+gopher_protocol_select="tcp_protocol"
http_protocol_select="tcp_protocol"
http_protocol_suggest="zlib"
httpproxy_protocol_select="tcp_protocol"
diff --git a/libavformat/gopher.c b/libavformat/gopher.c
index 8b6d14a1f7..7c88ab01a8 100644
--- a/libavformat/gopher.c
+++ b/libavformat/gopher.c
@@ -110,13 +110,13 @@ static int gopher_read(URLContext *h, uint8_t *buf, int size)
return len;
}
-
const URLProtocol ff_gopher_protocol = {
- .name = "gopher",
- .url_open = gopher_open,
- .url_read = gopher_read,
- .url_write = gopher_write,
- .url_close = gopher_close,
- .priv_data_size = sizeof(GopherContext),
- .flags = URL_PROTOCOL_FLAG_NETWORK,
+ .name = "gopher",
+ .url_open = gopher_open,
+ .url_read = gopher_read,
+ .url_write = gopher_write,
+ .url_close = gopher_close,
+ .priv_data_size = sizeof(GopherContext),
+ .flags = URL_PROTOCOL_FLAG_NETWORK,
+ .default_whitelist = "gopher,tcp"
};
More information about the ffmpeg-cvslog
mailing list