avformat/gopher: Add default_whitelist to ff_gopher_protocol

Signed-off-by: parazyd <parazyd@dyne.org>
Signed-off-by: Marton Balint <cus@passwd.hu>

diff --git a/configure b/configure
index d11942fced116800956ac42ebe61ac342b422e5b..1c0888ffa6c288b79d1a8c8c636796a917817bbd 100755 (executable)
--- 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 8b6d14a1f77b2d6917c881045f0999b9babaecf4..7c88ab01a83a4abbb659515bb58cdcce660b1256 100644 (file)
--- 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"
 };