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 /libmpdemux/stream.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 'libmpdemux/stream.h')
| -rw-r--r-- | libmpdemux/stream.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h index 3c3b547289..f9aa74d9d2 100644 --- a/libmpdemux/stream.h +++ b/libmpdemux/stream.h @@ -47,7 +47,7 @@ #define STREAM_CTRL_RESET 0 -#ifdef STREAMING +#ifdef MPLAYER_NETWORK #include "network.h" #endif @@ -93,7 +93,7 @@ typedef struct stream_st { void* cache_data; void* priv; // used for DVD, TV, RTSP etc char* url; // strdup() of filename/url -#ifdef STREAMING +#ifdef MPLAYER_NETWORK streaming_ctrl_t *streaming_ctrl; #endif unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE]; |