Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv24019 Modified Files: demuxer.c Log Message: fixed tv detection in demux_open Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- demuxer.c 22 Nov 2001 15:39:53 -0000 1.49 +++ demuxer.c 23 Nov 2001 18:51:32 -0000 1.50 @@ -374,13 +374,11 @@ #ifdef USE_TV //=============== Try to open as TV-input: ================= -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_TV){ +if((tv_param_on == 1) && + (file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_TV)){ demuxer=new_demuxer(stream,DEMUXER_TYPE_TV,audio_id,video_id,dvdsub_id); - if(tv_param_on==1) - { - mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected TV! ;-)\n"); - file_format=DEMUXER_TYPE_TV; - } + mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected TV! ;-)\n"); + file_format=DEMUXER_TYPE_TV; } #endif //=============== Try to open as AVI file: =================