summaryrefslogtreecommitdiffstats
path: root/libmpdemux/cdda.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/cdda.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/cdda.c')
-rw-r--r--libmpdemux/cdda.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/cdda.c b/libmpdemux/cdda.c
index 61a67d8ee6..d33e5a5dba 100644
--- a/libmpdemux/cdda.c
+++ b/libmpdemux/cdda.c
@@ -101,7 +101,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) {
return STREAM_UNSUPORTED;
}
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
if(strncmp(st->url,"cddb",4) == 0) {
i = cddb_resolve(p->device, &xmcd_file);
if(i == 0) {
@@ -209,7 +209,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) {
paranoia_seek(priv->cdp,priv->start_sector,SEEK_SET);
priv->sector = priv->start_sector;
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
if(cddb_info) {
cd_info_free(cd_info);
priv->cd_info = cddb_info;