diff -u /F/linux/MPlayer/MPlayer-cvs/libmpdemux/demux_avi.c MPlayer-cvs/libmpdemux/demux_avi.c
--- /F/linux/MPlayer/MPlayer-cvs/libmpdemux/demux_avi.c	Wed Mar 17 20:59:02 2004
+++ MPlayer-cvs/libmpdemux/demux_avi.c	Sat May  8 11:34:36 2004
@@ -214,7 +214,7 @@
     }
 
     pos = (off_t)priv->idx_offset+AVI_IDX_OFFSET(idx);
-    if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->flags & STREAM_SEEK)){
+    if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->flags & DEMUX_STREAM_SEEK)){
       mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range!   idx=0x%X  \n",pos);
       continue;
     }
@@ -246,7 +246,7 @@
     if(!(idx->dwFlags&AVIIF_KEYFRAME)) flags=0;
   } else {
     demux->filepos=stream_tell(demux->stream);
-    if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->flags & STREAM_SEEK)){
+    if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->flags & DEMUX_STREAM_SEEK)){
           demux->stream->eof=1;
           return 0;
     }
@@ -453,7 +453,7 @@
   demuxer->priv=(void*)priv;
 
   //---- AVI header:
-  read_avi_header(demuxer,(demuxer->stream->flags & STREAM_SEEK_BW)?index_mode:-2);
+  read_avi_header(demuxer,(demuxer->stream->flags & DEMUX_STREAM_SEEK_BW)?index_mode:-2);
   
   if(demuxer->audio->id>=0 && !demuxer->a_streams[demuxer->audio->id]){
       mp_msg(MSGT_DEMUX,MSGL_WARN,"AVI: invalid audio stream ID: %d - ignoring (nosound)\n",demuxer->audio->id);
diff -u /F/linux/MPlayer/MPlayer-cvs/libmpdemux/network.c MPlayer-cvs/libmpdemux/network.c
--- /F/linux/MPlayer/MPlayer-cvs/libmpdemux/network.c	Sun May  2 13:09:10 2004
+++ MPlayer-cvs/libmpdemux/network.c	Sat May  8 11:34:38 2004
@@ -1207,7 +1207,7 @@
 		return -1;
 	}
 	if( ret==1 ) {
-		stream->flags |= STREAM_SEEK;
+		stream->flags |= DEMUX_STREAM_SEEK;
 		stream->seek = http_seek;
 	}
 
diff -u /F/linux/MPlayer/MPlayer-cvs/libmpdemux/stream.c MPlayer-cvs/libmpdemux/stream.c
--- /F/linux/MPlayer/MPlayer-cvs/libmpdemux/stream.c	Sun Mar 14 15:41:34 2004
+++ MPlayer-cvs/libmpdemux/stream.c	Sat May  8 11:34:36 2004
@@ -129,10 +129,10 @@
   }
   if(s->type <= -2)
     mp_msg(MSGT_OPEN,MSGL_WARN, "Warning streams need a type !!!!\n");
-  if(s->flags & STREAM_SEEK && !s->seek)
-    s->flags &= ~STREAM_SEEK;
-  if(s->seek && !(s->flags & STREAM_SEEK))
-    s->flags |= STREAM_SEEK;
+  if(s->flags & DEMUX_STREAM_SEEK && !s->seek)
+    s->flags &= ~DEMUX_STREAM_SEEK;
+  if(s->seek && !(s->flags & DEMUX_STREAM_SEEK))
+    s->flags |= DEMUX_STREAM_SEEK;
   
 
   mp_msg(MSGT_OPEN,MSGL_V, "STREAM: [%s] %s\n",sinfo->name,filename);
diff -u /F/linux/MPlayer/MPlayer-cvs/libmpdemux/stream.h MPlayer-cvs/libmpdemux/stream.h
--- /F/linux/MPlayer/MPlayer-cvs/libmpdemux/stream.h	Sun Mar 14 15:41:34 2004
+++ MPlayer-cvs/libmpdemux/stream.h	Sat May  8 11:34:36 2004
@@ -31,10 +31,10 @@
 #define STREAM_READ  0
 #define STREAM_WRITE 1
 /// Seek flags, if not mannualy set and s->seek isn't NULL
-/// STREAM_SEEK is automaticly set
-#define STREAM_SEEK_BW  2
-#define STREAM_SEEK_FW  4
-#define STREAM_SEEK  (STREAM_SEEK_BW|STREAM_SEEK_FW)
+/// DEMUX_STREAM_SEEK is automaticly set
+#define DEMUX_STREAM_SEEK_BW  2
+#define DEMUX_STREAM_SEEK_FW  4
+#define DEMUX_STREAM_SEEK  (DEMUX_STREAM_SEEK_BW|DEMUX_STREAM_SEEK_FW)
 
 //////////// Open return code
 /// This can't open the requested protocol (used by stream wich have a
@@ -229,7 +229,7 @@
 }
 
 inline static int stream_skip(stream_t *s,off_t len){
-  if( (len<0 && (s->flags & STREAM_SEEK_BW)) || (len>2*STREAM_BUFFER_SIZE && (s->flags & STREAM_SEEK_FW)) ) {
+  if( (len<0 && (s->flags & DEMUX_STREAM_SEEK_BW)) || (len>2*STREAM_BUFFER_SIZE && (s->flags & DEMUX_STREAM_SEEK_FW)) ) {
     // negative or big skip!
     return stream_seek(s,stream_tell(s)+len);
   }
diff -u /F/linux/MPlayer/MPlayer-cvs/libmpdemux/stream_file.c MPlayer-cvs/libmpdemux/stream_file.c
--- /F/linux/MPlayer/MPlayer-cvs/libmpdemux/stream_file.c	Sun Mar 14 15:41:34 2004
+++ MPlayer-cvs/libmpdemux/stream_file.c	Sat May  8 11:37:10 2004
@@ -113,7 +113,7 @@
   if(len == -1) {
     stream->seek = seek_forward;
     stream->type = STREAMTYPE_STREAM; // Must be move to STREAMTYPE_FILE
-    stream->flags |= STREAM_SEEK_FW;
+    stream->flags |= DEMUX_STREAM_SEEK_FW;
   } else if(len >= 0) {
     stream->seek = seek;
     stream->end_pos = len;
diff -u /F/linux/MPlayer/MPlayer-cvs/libmpdemux/stream_netstream.c MPlayer-cvs/libmpdemux/stream_netstream.c
--- /F/linux/MPlayer/MPlayer-cvs/libmpdemux/stream_netstream.c	Sun Aug 31 18:51:06 2003
+++ MPlayer-cvs/libmpdemux/stream_netstream.c	Sat May  8 11:35:52 2004
@@ -283,7 +283,7 @@
 
   stream->fill_buffer = fill_buffer;
   stream->control = control;
-  if(stream->flags & STREAM_SEEK)
+  if(stream->flags & DEMUX_STREAM_SEEK)
     stream->seek = seek;
   stream->close = close_s;