[vlc-commits] dtv: ignore SEC errors

Rémi Denis-Courmont git at videolan.org
Sat Jun 15 19:46:00 CEST 2013


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jun 15 20:45:37 2013 +0300| [2028d9bd93bb09683e5ccef3c82de0cafdf78e44] | committer: Rémi Denis-Courmont

dtv: ignore SEC errors

This should fix ISDB-S tuning.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2028d9bd93bb09683e5ccef3c82de0cafdf78e44
---

 modules/access/dtv/access.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index 2de8740..367f5c6 100644
--- a/modules/access/dtv/access.c
+++ b/modules/access/dtv/access.c
@@ -862,14 +862,14 @@ static char var_InheritPolarization (vlc_object_t *obj)
     return pol;
 }
 
-static int sec_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
+static void sec_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
 {
     char pol = var_InheritPolarization (obj);
     unsigned lowf = var_InheritInteger (obj, "dvb-lnb-low");
     unsigned highf = var_InheritInteger (obj, "dvb-lnb-high");
     unsigned switchf = var_InheritInteger (obj, "dvb-lnb-switch");
 
-    return dvb_set_sec (dev, freq, pol, lowf, highf, switchf);
+    dvb_set_sec (dev, freq, pol, lowf, highf, switchf);
 }
 
 static int dvbs_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
@@ -879,7 +879,7 @@ static int dvbs_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
 
     int ret = dvb_set_dvbs (dev, freq, srate, fec);
     if (ret == 0)
-        ret = sec_setup (obj, dev, freq);
+        sec_setup (obj, dev, freq);
     return ret;
 }
 
@@ -893,7 +893,7 @@ static int dvbs2_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
 
     int ret = dvb_set_dvbs2 (dev, freq, mod, srate, fec, pilot, rolloff);
     if (ret == 0)
-        ret = sec_setup (obj, dev, freq);
+        sec_setup (obj, dev, freq);
     return ret;
 }
 
@@ -951,7 +951,7 @@ static int isdbs_setup (vlc_object_t *obj, dvb_device_t *dev, uint64_t freq)
 
     int ret = dvb_set_isdbs (dev, freq, ts_id);
     if (ret == 0)
-        ret = sec_setup (obj, dev, freq);
+        sec_setup (obj, dev, freq);
     return ret;
 }
 



More information about the vlc-commits mailing list