From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 24 May 2016 18:15:11 +0000 (+0200)
Subject: satip client: do not set auto modulation, fixes #3821
X-Git-Tag: v4.2.1~471
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=afae0496717b330a8e72771d95b0541c8c72cccb;p=thirdparty%2Ftvheadend.git

satip client: do not set auto modulation, fixes #3821
---

diff --git a/src/input/mpegts/satip/satip_rtsp.c b/src/input/mpegts/satip/satip_rtsp.c
index 4ea84677b..83bfe73b4 100644
--- a/src/input/mpegts/satip/satip_rtsp.c
+++ b/src/input/mpegts/satip/satip_rtsp.c
@@ -164,7 +164,8 @@ satip_rtsp_setup( http_client_t *hc, int src, int fe,
     satip_rtsp_add_val("sr", buf, dmc->u.dmc_fe_qpsk.symbol_rate);
     ADD(dmc_fe_delsys,              msys,  "dvbs");
     if (dmc->dmc_fe_modulation != DVB_MOD_NONE &&
-        dmc->dmc_fe_modulation != DVB_MOD_AUTO)
+        dmc->dmc_fe_modulation != DVB_MOD_AUTO &&
+        dmc->dmc_fe_modulation != DVB_MOD_QAM_AUTO)
       ADD(dmc_fe_modulation,        mtype, "qpsk");
     ADD(u.dmc_fe_qpsk.polarisation, pol,   "h"   );
     if (dmc->u.dmc_fe_qpsk.fec_inner != DVB_FEC_NONE &&
@@ -186,7 +187,10 @@ satip_rtsp_setup( http_client_t *hc, int src, int fe,
     satip_rtsp_add_val("freq", buf, dmc->dmc_fe_freq / 1000);
     satip_rtsp_add_val("sr", buf, dmc->u.dmc_fe_qam.symbol_rate);
     ADD(dmc_fe_delsys,              msys,  "dvbc");
-    ADD(dmc_fe_modulation,          mtype, "64qam");
+    if (dmc->dmc_fe_modulation != DVB_MOD_AUTO &&
+        dmc->dmc_fe_modulation != DVB_MOD_NONE &&
+        dmc->dmc_fe_modulation != DVB_MOD_QAM_AUTO)
+      ADD(dmc_fe_modulation,          mtype, "64qam");
     /* missing plp */
     if (dmc->u.dmc_fe_qam.fec_inner != DVB_FEC_NONE &&
         dmc->u.dmc_fe_qam.fec_inner != DVB_FEC_AUTO)