diff options
author | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-05-17 12:24:01 +0000 |
---|---|---|
committer | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-05-17 12:24:01 +0000 |
commit | ff6a17f203ec4243f167ca2c82b94ecd6e775212 (patch) | |
tree | 766fcbece9478effd011efb821fe852ea61dee6a /cfg-common.h | |
parent | 898cd006a8c134ea47b3e28f96d2468bc0cf84e5 (diff) | |
download | mpv-ff6a17f203ec4243f167ca2c82b94ecd6e775212.tar.bz2 mpv-ff6a17f203ec4243f167ca2c82b94ecd6e775212.tar.xz |
Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10122 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
-rw-r--r-- | cfg-common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cfg-common.h b/cfg-common.h index 9f3d03bbbd..238a26c195 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -36,7 +36,7 @@ {"csslib", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif -#ifdef STREAMING +#ifdef MPLAYER_NETWORK {"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, @@ -245,7 +245,7 @@ extern int flip; /* from dec_audio, currently used for ac3surround decoder only */ extern int audio_output_channels; -#ifdef STREAMING +#ifdef MPLAYER_NETWORK /* defined in network.c */ extern char *network_username; extern char *network_password; |