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/asfheader.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/asfheader.c')
| -rw-r--r-- | libmpdemux/asfheader.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index ea77f798e6..8c816865fa 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -327,7 +327,7 @@ while(!stream_eof(demuxer->stream)){ if(streams) { uint32_t vr = 0, ar = 0,i; -#ifdef STREAMING +#ifdef MPLAYER_NETWORK if( demuxer->stream->streaming_ctrl!=NULL ) { if( demuxer->stream->streaming_ctrl->bandwidth!=0 && demuxer->stream->streaming_ctrl->data!=NULL ) { best_audio = ((asf_http_streaming_ctrl_t*)demuxer->stream->streaming_ctrl->data)->audio_id; |