[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.154,1.155 cfg-mencoder.h,1.42,1.43 cfg-common.h,1.43,1.44

[Alex Beregszaszi]

Hi,

> Index: cfg-common.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/cfg-common.h,v
> retrieving revision 1.43
> retrieving revision 1.44
> diff -u -r1.43 -r1.44
> --- cfg-common.h	2 Jun 2002 12:48:55 -0000	1.43
> +++ cfg-common.h	25 Jun 2002 08:09:16 -0000	1.44
> @@ -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},
doesn't this 'pass' conflicts with divx4linux's pass option? (noticed by Nexus)

-
alex