summaryrefslogtreecommitdiffstats
path: root/core/options.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-07 19:40:14 +0200
committerwm4 <wm4@nowhere>2013-07-07 19:42:38 +0200
commit854303ad49d188d96af8151b290162916c81c993 (patch)
treed47fc0ccd34adf47df7612c8b213d09b3816eae5 /core/options.c
parentfeaa721916303c36dcd676c11ac74ecdec2db006 (diff)
downloadmpv-854303ad49d188d96af8151b290162916c81c993.tar.bz2
mpv-854303ad49d188d96af8151b290162916c81c993.tar.xz
Remove internal network support
This commit removes the "old" networking code in favor of libavformat's code. The code was still used for mp_http, udp, ftp, cddb. http has been mapped to libavformat's http support since approximately 6 months ago. udp and ftp have support in ffmpeg (though ftp was added only last month). cddb support is removed with this commit - it's probably not important and rarely used if at all, so we don't care about it.
Diffstat (limited to 'core/options.c')
-rw-r--r--core/options.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/core/options.c b/core/options.c
index 3a60e3c810..b00f79c003 100644
--- a/core/options.c
+++ b/core/options.c
@@ -40,8 +40,6 @@
#include "mp_core.h"
#include "osdep/priority.h"
-char *network_username=NULL;
-char *network_password=NULL;
int network_bandwidth=0;
int network_cookies_enabled = 0;
char *network_useragent="MPlayer 1.1-4.7";
@@ -351,20 +349,11 @@ const m_option_t mp_opts[] = {
{"bluray-angle", &bluray_angle, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL},
#endif /* CONFIG_LIBBLURAY */
- {"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
{"http-header-fields", &network_http_header_fields, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
{"user-agent", &network_useragent, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"referrer", &network_referrer, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"cookies", &network_cookies_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"cookies-file", &cookies_file, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"prefer-ipv4", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"ipv4-only-proxy", &network_ipv4_only_proxy, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"reuse-socket", &reuse_socket, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-#ifdef HAVE_AF_INET6
- {"prefer-ipv6", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-#endif /* HAVE_AF_INET6 */
// ------------------------- demuxer options --------------------