summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2011-10-05 00:11:21 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2011-10-05 00:11:21 +0100
commite4b75132a31fef25960ea7abbf5dace418b1fc37 (patch)
treef219c6fcf2ec0d8f1c58102872edf9d347dfa4a6 /src/input
parent6a2b53c22febcbc2041d760dccd795f388bc10c4 (diff)
parent24cb81b12aa9ab7c351f917fa2027ee251a5be7f (diff)
downloadxine-lib-e4b75132a31fef25960ea7abbf5dace418b1fc37.tar.gz
xine-lib-e4b75132a31fef25960ea7abbf5dace418b1fc37.tar.bz2
Merge commits which I've already merged from 1.1...
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_dvb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index f56e806fd..0fac0290a 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -592,7 +592,7 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter)
asprintf(&video_device,"/dev/dvb/adapter%i/video0",this->adapter_num);
asprintf(&frontend_device,"/dev/dvb/adapter%i/frontend0",this->adapter_num);
- if ((this->fd_frontend = open(frontend_device, O_RDWR)) < 0) {
+ if ((this->fd_frontend = xine_open_cloexec(frontend_device, O_RDWR)) < 0) {
xprintf(this->xine, XINE_VERBOSITY_DEBUG, "FRONTEND DEVICE: %s\n", strerror(errno));
tuner_dispose(this);
this = NULL;
@@ -608,7 +608,7 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter)
}
for (x = 0; x < MAX_FILTERS; x++) {
- this->fd_pidfilter[x] = open(this->demux_device, O_RDWR);
+ this->fd_pidfilter[x] = xine_open_cloexec(this->demux_device, O_RDWR);
if (this->fd_pidfilter[x] < 0) {
xprintf(this->xine, XINE_VERBOSITY_DEBUG, "DEMUX DEVICE PIDfilter: %s\n", strerror(errno));
tuner_dispose(this);