summaryrefslogtreecommitdiffstats
path: root/libmpdemux/open.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-10 23:32:10 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-10 23:32:10 +0000
commitfc363d39bc8a1aecc72b62c1108d7cc3b0b40a64 (patch)
tree7af9a7653c089d0c57bda269d4ffc82a2a97b789 /libmpdemux/open.c
parent31dc28382695dd2fa4a86a9676113a4eb36010ec (diff)
downloadmpv-fc363d39bc8a1aecc72b62c1108d7cc3b0b40a64.tar.bz2
mpv-fc363d39bc8a1aecc72b62c1108d7cc3b0b40a64.tar.xz
tv update
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2803 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/open.c')
-rw-r--r--libmpdemux/open.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libmpdemux/open.c b/libmpdemux/open.c
index 6b820697d4..298d7064c5 100644
--- a/libmpdemux/open.c
+++ b/libmpdemux/open.c
@@ -72,7 +72,7 @@ extern int vcd_get_track_end(int fd,int track);
#ifdef USE_TV
#include "tv.h"
-extern tvi_handle_t *tv_handler;
+tvi_handle_t *tv_handler;
#endif
// Open a new stream (stdin/file/vcd/url)
@@ -251,12 +251,13 @@ if(dvd_title){
//============ Check for TV-input ====
if (tv_param_on==1)
{
- stream=new_stream(-1,STREAMTYPE_TV);
+ stream = new_stream(-1,STREAMTYPE_TV);
tv_handler = tv_begin();
if (!tv_handler)
return(NULL);
- tv_init(tv_handler);
- return(stream);
+ if (tv_init(tv_handler) == 1)
+ return(stream);
+ return(NULL);
}
#endif