summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-08 07:20:37 +0000
committeratmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-08 07:20:37 +0000
commitd0f6333b9812c9af243bc6c7898fcc1d59eb68e3 (patch)
tree28f0d082e47f68f196ff930a37fab56f44327b3f
parentfbab7bb6b4cd52736fd3d2b349b076920d34d83f (diff)
downloadmpv-d0f6333b9812c9af243bc6c7898fcc1d59eb68e3.tar.bz2
mpv-d0f6333b9812c9af243bc6c7898fcc1d59eb68e3.tar.xz
cosmetix, merge streaming vars extern declarations into cfg-common.h, where they IMHO belong.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6672 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--cfg-common.h7
-rw-r--r--cfg-mencoder.h7
-rw-r--r--cfg-mplayer.h7
3 files changed, 7 insertions, 14 deletions
diff --git a/cfg-common.h b/cfg-common.h
index 38c82be0f8..84befe486e 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -164,6 +164,13 @@
#include "config.h"
+#ifdef STREAMING
+/* defined in network.c */
+extern char *network_username;
+extern char *network_password;
+extern int network_bandwidth;
+#endif
+
#include "libmpdemux/tv.h"
#ifdef USE_TV
diff --git a/cfg-mencoder.h b/cfg-mencoder.h
index 721c1688e4..4dfa46d691 100644
--- a/cfg-mencoder.h
+++ b/cfg-mencoder.h
@@ -20,13 +20,6 @@ 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;
-extern int network_bandwidth;
-#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 39f4d0eb6e..0f84cec7b8 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -99,13 +99,6 @@ extern int xinerama_screen;
extern int nortc;
#endif
-#ifdef STREAMING
-/* defined in network.c */
-extern char *network_username;
-extern char *network_password;
-extern int network_bandwidth;
-#endif
-
/* from libvo/aspect.c */
extern float monitor_aspect;