summaryrefslogtreecommitdiffstats
path: root/libmpdemux/open.c
diff options
context:
space:
mode:
authorbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-05-17 12:24:01 +0000
committerbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-05-17 12:24:01 +0000
commitff6a17f203ec4243f167ca2c82b94ecd6e775212 (patch)
tree766fcbece9478effd011efb821fe852ea61dee6a /libmpdemux/open.c
parent898cd006a8c134ea47b3e28f96d2468bc0cf84e5 (diff)
downloadmpv-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 'libmpdemux/open.c')
-rw-r--r--libmpdemux/open.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/open.c b/libmpdemux/open.c
index 12d35b20df..73ea6f5eae 100644
--- a/libmpdemux/open.c
+++ b/libmpdemux/open.c
@@ -20,7 +20,7 @@
#include "demuxer.h"
#include "mf.h"
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
#include "url.h"
#include "network.h"
extern int streaming_start( stream_t *stream, int *demuxer_type, URL_t *url);
@@ -466,7 +466,7 @@ if(strncmp("dvbin://",filename,8) == 0)
}
#endif
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
#ifdef STREAMING_LIVE_DOT_COM
// Check for a SDP file:
if (strncmp("sdp://",filename,6) == 0) {