diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-23 18:51:32 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-23 18:51:32 +0000 |
commit | 6f70d068ad2e89df507848d1912f1350dffd06de (patch) | |
tree | 5e7d155e19f0409658c89fa48566b2fc1e31518f /libmpdemux | |
parent | 575828bf12791a7809e37807cf4a835f199eb8f8 (diff) | |
download | mpv-6f70d068ad2e89df507848d1912f1350dffd06de.tar.bz2 mpv-6f70d068ad2e89df507848d1912f1350dffd06de.tar.xz |
fixed tv detection in demux_open
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3092 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demuxer.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index bc72a890d2..56e1bc7ac0 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -374,13 +374,11 @@ sh_video_t *sh_video=NULL; #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: ================= |