commit 8d506a1e75380acb99f08c4cf50e466cc6efcf36 (HEAD, refs/heads/master) Author: Adam Sutton Date: Mon Apr 7 17:02:28 2014 +0100 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 ac37b5e..094dd7e 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;