From: Adam Sutton <dev@adamsutton.me.uk>
Date: Mon, 7 Apr 2014 16:02:28 +0000 (+0100)
Subject: mpegts dvb: fix rather dubious assert (fixes #2036)
X-Git-Tag: v4.1~2188
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dfeb0cee478d0ce4c8623fcd4e0811f24aef5fdb;p=thirdparty%2Ftvheadend.git

mpegts dvb: fix rather dubious assert (fixes #2036)

Could have ensure this was set correctly on input, but given that it was being
set if no config was passed and almost certainly it must by definition be the
same as the source mux, might as well simplify things.
---

diff --git a/src/input/mpegts/mpegts_mux_dvb.c b/src/input/mpegts/mpegts_mux_dvb.c
index ac37b5eb4..094dd7e35 100644
--- a/src/input/mpegts/mpegts_mux_dvb.c
+++ b/src/input/mpegts/mpegts_mux_dvb.c
@@ -647,13 +647,11 @@ dvb_mux_create0
                                 (mpegts_network_t*)ln, onid, tsid, conf)))
     return NULL;
   lm = (dvb_mux_t*)mm;
-  lm->lm_tuning.dmc_fe_type = ln->ln_type;
 
   /* Tuning */
-  if (dmc) {
-    assert(dmc->dmc_fe_type == lm->lm_tuning.dmc_fe_type);
+  if (dmc)
     memcpy(&lm->lm_tuning, dmc, sizeof(dvb_mux_conf_t));
-  }
+  lm->lm_tuning.dmc_fe_type = ln->ln_type;
 
   /* Callbacks */
   lm->mm_delete           = dvb_mux_delete;