Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv20805 Modified Files: demux_mov.c demuxer.c Log Message: .mov support can be disabled Index: demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/demux_mov.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- demux_mov.c 7 Oct 2001 00:22:43 -0000 1.7 +++ demux_mov.c 7 Oct 2001 21:59:49 -0000 1.8 @@ -440,12 +440,12 @@ if(!stream_seek(demuxer->stream,priv->moov_start)) return 0; // ??? lschunks(demuxer, 0, priv->moov_end, NULL); - // Build tables: - // ... - - mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_MOVnotyetsupp); - +#if 1 return 1; +#else + mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_MOVnotyetsupp); + return 0; +#endif } // return value: Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/demuxer.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- demuxer.c 6 Oct 2001 11:29:18 -0000 1.32 +++ demuxer.c 7 Oct 2001 21:59:49 -0000 1.33 @@ -455,9 +455,9 @@ switch(file_format){ case DEMUXER_TYPE_MOV: { - mov_read_header(demuxer); - sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video; - sh_audio=d_audio->sh;if(sh_audio) sh_audio->ds=d_audio; + if(!mov_read_header(demuxer)) return NULL; +// sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video; +// sh_audio=d_audio->sh;if(sh_audio) sh_audio->ds=d_audio; break; } case DEMUXER_TYPE_AVI: {