Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv10080 Modified Files: demux_bmp.c demux_rawdv.c demux_roq.c Log Message: removed nonsense stream_reset/seek in check_file() Index: demux_bmp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_bmp.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- demux_bmp.c 24 Apr 2002 15:36:06 -0000 1.2 +++ demux_bmp.c 30 Apr 2003 20:24:09 -0000 1.3 @@ -23,9 +23,6 @@ // Check if a file is a BMP file depending on whether starts with 'BM' int bmp_check_file(demuxer_t *demuxer) { - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, 0); - if (stream_read_word(demuxer->stream) == (('B' << 8) | 'M')) return 1; else Index: demux_rawdv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rawdv.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- demux_rawdv.c 21 Mar 2003 16:13:16 -0000 1.6 +++ demux_rawdv.c 30 Apr 2003 20:24:09 -0000 1.7 @@ -68,8 +68,6 @@ mp_msg(MSGT_DEMUX,MSGL_V,"Checking for DV\n"); - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, 0); bytes_read=stream_read(demuxer->stream,tmp_buffer,DV_PAL_FRAME_SIZE); if ((bytes_read!=DV_PAL_FRAME_SIZE) && (bytes_read!=DV_NTSC_FRAME_SIZE)) return 0; Index: demux_roq.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_roq.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- demux_roq.c 24 Apr 2002 15:36:07 -0000 1.7 +++ demux_roq.c 30 Apr 2003 20:24:09 -0000 1.8 @@ -50,9 +50,6 @@ // 84 10 FF FF FF FF xx xx int roq_check_file(demuxer_t *demuxer) { - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, 0); - if ((stream_read_dword(demuxer->stream) == 0x8410FFFF) && ((stream_read_dword(demuxer->stream) & 0xFFFF0000) == 0xFFFF0000)) return 1;