summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-25 08:09:16 +0000
committerbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-25 08:09:16 +0000
commit09c7e3191e01d9e5c5ca705ec6f5073b6fda31a1 (patch)
treecf9366a923a6308077896d592683d01235e96fe6
parentf7f0dc084cf0086266ee242f0e01e48709afe0b7 (diff)
downloadmpv-09c7e3191e01d9e5c5ca705ec6f5073b6fda31a1.tar.bz2
mpv-09c7e3191e01d9e5c5ca705ec6f5073b6fda31a1.tar.xz
Added -user -pass options for http authentication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6560 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--cfg-common.h7
-rw-r--r--cfg-mencoder.h6
-rw-r--r--cfg-mplayer.h6
3 files changed, 19 insertions, 0 deletions
diff --git a/cfg-common.h b/cfg-common.h
index 5a28a65c45..2239228d30 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -39,6 +39,13 @@
{"csslib", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif
+#ifdef STREAMING
+ {"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"pass", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL},
+#else
+ {"user", "MPlayer was compiled WITHOUT streaming(network) support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+#endif
+
// ------------------------- demuxer options --------------------
// number of frames to play/convert
diff --git a/cfg-mencoder.h b/cfg-mencoder.h
index 4dfa46d691..9227bfaa9a 100644
--- a/cfg-mencoder.h
+++ b/cfg-mencoder.h
@@ -20,6 +20,12 @@ extern void revertPPOpt(void *conf, char* opt);
extern struct config divx4opts_conf[];
#endif
+#ifdef STREAMING
+/* defined in network.c */
+extern char *network_username;
+extern char *network_password;
+#endif
+
#ifdef HAVE_MP3LAME
struct config lameopts_conf[]={
{"q", &lame_param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 0f84cec7b8..7f6262ad45 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -99,6 +99,12 @@ extern int xinerama_screen;
extern int nortc;
#endif
+#ifdef STREAMING
+/* defined in network.c */
+extern char *network_username;
+extern char *network_password;
+#endif
+
/* from libvo/aspect.c */
extern float monitor_aspect;