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.c | |
| 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.c')
| -rw-r--r-- | libmpdemux/stream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c index 7d0989a1de..d6fac88dc4 100644 --- a/libmpdemux/stream.c +++ b/libmpdemux/stream.c @@ -47,7 +47,7 @@ extern stream_info_t stream_info_vcd; #ifdef HAVE_CDDA extern stream_info_t stream_info_cdda; #endif -#ifdef STREAMING +#ifdef MPLAYER_NETWORK extern stream_info_t stream_info_netstream; #endif extern stream_info_t stream_info_null; @@ -60,7 +60,7 @@ stream_info_t* auto_open_streams[] = { #ifdef HAVE_CDDA &stream_info_cdda, #endif -#ifdef STREAMING +#ifdef MPLAYER_NETWORK &stream_info_netstream, #endif &stream_info_null, @@ -167,7 +167,7 @@ int stream_fill_buffer(stream_t *s){ break; #endif case STREAMTYPE_STREAM: -#ifdef STREAMING +#ifdef MPLAYER_NETWORK if( s->streaming_ctrl!=NULL ) { len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break; } else { @@ -299,7 +299,7 @@ if(newpos==0 || newpos!=s->pos){ // Some streaming protocol allow to seek backward and forward // A function call that return -1 can tell that the protocol // doesn't support seeking. -#ifdef STREAMING +#ifdef MPLAYER_NETWORK if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_seek ) { if( s->streaming_ctrl->streaming_seek( s->fd, pos, s->streaming_ctrl )<0 ) { mp_msg(MSGT_STREAM,MSGL_INFO,"Stream not seekable!\n"); |