# HG changeset patch # User atmos4 # Date 1026112837 0 # Node ID 7c4663f0a8a1d4cc90e7ac8d7c1bb2ce5e4b7e58 # Parent 70b54c2e0292bfcda73658912d88834f7330c959 cosmetix, merge streaming vars extern declarations into cfg-common.h, where they IMHO belong. diff -r 70b54c2e0292 -r 7c4663f0a8a1 cfg-common.h --- a/cfg-common.h Mon Jul 08 04:11:23 2002 +0000 +++ b/cfg-common.h Mon Jul 08 07:20:37 2002 +0000 @@ -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 -r 70b54c2e0292 -r 7c4663f0a8a1 cfg-mencoder.h --- a/cfg-mencoder.h Mon Jul 08 04:11:23 2002 +0000 +++ b/cfg-mencoder.h Mon Jul 08 07:20:37 2002 +0000 @@ -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}, diff -r 70b54c2e0292 -r 7c4663f0a8a1 cfg-mplayer.h --- a/cfg-mplayer.h Mon Jul 08 04:11:23 2002 +0000 +++ b/cfg-mplayer.h Mon Jul 08 07:20:37 2002 +0000 @@ -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;