diff options
author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-11-05 23:37:52 +0000 |
---|---|---|
committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-11-05 23:37:52 +0000 |
commit | e3d5eacec36460eb5d0ce462f3bce4a83110c3d1 (patch) | |
tree | b267d454805465f67765b43965be8814059ffba9 /stream | |
parent | 69ad7080f9177c5fa3d9a7bd9aa252b04a6f553e (diff) | |
download | mpv-e3d5eacec36460eb5d0ce462f3bce4a83110c3d1.tar.bz2 mpv-e3d5eacec36460eb5d0ce462f3bce4a83110c3d1.tar.xz |
set to -1 fds that were closed; handle the sec_fd only if CONFIG_DVB_HEAD isn't defined; patch by Reimar
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27897 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r-- | stream/dvb_tune.c | 4 | ||||
-rw-r--r-- | stream/stream_dvb.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c index ade51a4c46..b631e13e73 100644 --- a/stream/dvb_tune.c +++ b/stream/dvb_tune.c @@ -117,9 +117,7 @@ int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt) mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING FRONTEND DEVICE %s: ERRNO %d\n", frontend_dev, errno); return 0; } -#ifdef CONFIG_DVB_HEAD - priv->sec_fd=-1; -#else +#ifndef CONFIG_DVB_HEAD priv->sec_fd = open(sec_dev, O_RDWR); if(priv->sec_fd < 0) { diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 046a052d6c..78bc8a9309 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -614,6 +614,7 @@ static void dvbin_close(stream_t *stream) #ifndef CONFIG_DVB_HEAD close(priv->sec_fd); #endif + priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1; priv->is_on = 0; dvb_free_config(priv->config); @@ -685,6 +686,7 @@ static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format) return STREAM_ERROR; priv = (dvb_priv_t *)stream->priv; + priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1; priv->config = dvb_get_config(); if(priv->config == NULL) { |