[Mplayer-cvslog] CVS: main mplayer.c,1.152,1.153

[Bertrand Baudet]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv31635

Modified Files:
	mplayer.c 
Log Message:
Did some cleanup around STREAMING defined.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -r1.152 -r1.153
*** mplayer.c	2001/06/05 02:26:55	1.152
--- mplayer.c	2001/06/05 08:42:16	1.153
***************
*** 655,659 ****
  
  //=============== Try to open as AVI file: =================
- #ifdef STREAMING
  if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){
    stream_reset(stream);
--- 655,658 ----
***************
*** 673,699 ****
    }
  }
- #else
- stream_reset(stream);
- demuxer=new_demuxer(stream,DEMUXER_TYPE_AVI,audio_id,video_id,dvdsub_id);
- stream_seek(demuxer->stream,seek_to_byte);
- //printf("stream3=0x%X vs. 0x%X\n",demuxer->stream,stream);
- { //---- RIFF header:
-   int id=stream_read_dword_le(demuxer->stream); // "RIFF"
-   if(id==mmioFOURCC('R','I','F','F')){
-     stream_read_dword_le(demuxer->stream); //filesize
-     id=stream_read_dword_le(demuxer->stream); // "AVI "
-     if(id==formtypeAVI){ 
-       printf("Detected AVI file format!\n");
-       file_format=DEMUXER_TYPE_AVI;
-     }
-   }
- }
- #endif
  //=============== Try to open as ASF file: =================
- #ifdef STREAMING
  if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){
- #else
- if(file_format==DEMUXER_TYPE_UNKNOWN){
- #endif
    stream_reset(stream);
    demuxer=new_demuxer(stream,DEMUXER_TYPE_ASF,audio_id,video_id,dvdsub_id);
--- 672,677 ----
***************
*** 705,713 ****
  }
  //=============== Try to open as MPEG-PS file: =================
- #ifdef STREAMING
  if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
- #else
- if(file_format==DEMUXER_TYPE_UNKNOWN){
- #endif
    stream_reset(stream);
    demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,audio_id,video_id,dvdsub_id);
--- 683,687 ----


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog