[Mplayer-cvslog] CVS: main cfg-common.h,1.47,1.48 cfg-mencoder.h,1.44,1.45 cfg-mplayer.h,1.156,1.157

[Atmosfear]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv11436

Modified Files:
	cfg-common.h cfg-mencoder.h cfg-mplayer.h 
Log Message:
cosmetix, merge streaming vars extern declarations into cfg-common.h, where they IMHO belong.


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- cfg-common.h	5 Jul 2002 02:51:19 -0000	1.47
+++ cfg-common.h	8 Jul 2002 07:20:37 -0000	1.48
@@ -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

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cfg-mencoder.h	5 Jul 2002 02:51:19 -0000	1.44
+++ cfg-mencoder.h	8 Jul 2002 07:20:37 -0000	1.45
@@ -20,13 +20,6 @@
 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},

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- cfg-mplayer.h	5 Jul 2002 02:51:19 -0000	1.156
+++ cfg-mplayer.h	8 Jul 2002 07:20:37 -0000	1.157
@@ -99,13 +99,6 @@
 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;