]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
mpegts dvb: fix rather dubious assert (fixes #2036)
authorAdam Sutton <dev@adamsutton.me.uk>
Mon, 7 Apr 2014 16:02:28 +0000 (17:02 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Mon, 7 Apr 2014 16:11:12 +0000 (17:11 +0100)
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.

src/input/mpegts/mpegts_mux_dvb.c

index ac37b5eb4eee29e96bfd8dc6da6d3604f54a8c01..094dd7e350de6ee459d7de5d5e80288356cbe1bd 100644 (file)
@@ -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;