diff options
author | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-06-05 08:42:16 +0000 |
---|---|---|
committer | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-06-05 08:42:16 +0000 |
commit | a279c993dc77e7b05446ee88d873cefe9dffe544 (patch) | |
tree | 8cd1df884d1b24b9c825d0d6f1cb66045bfbd31a /mplayer.c | |
parent | 813b798ce54bc067a7f4e9db95f86c20b87849b5 (diff) | |
download | mpv-a279c993dc77e7b05446ee88d873cefe9dffe544.tar.bz2 mpv-a279c993dc77e7b05446ee88d873cefe9dffe544.tar.xz |
Did some cleanup around STREAMING defined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1027 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 26 |
1 files changed, 0 insertions, 26 deletions
@@ -654,7 +654,6 @@ if(vcd_track){ if(!has_audio) audio_id=-2; // do NOT read audio packets... //=============== Try to open as AVI file: ================= -#ifdef STREAMING if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){ stream_reset(stream); demuxer=new_demuxer(stream,DEMUXER_TYPE_AVI,audio_id,video_id,dvdsub_id); @@ -672,29 +671,8 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){ } } } -#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); stream_seek(demuxer->stream,seek_to_byte); @@ -704,11 +682,7 @@ if(file_format==DEMUXER_TYPE_UNKNOWN){ } } //=============== 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); stream_seek(demuxer->stream,seek_to_byte); |