stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Adam Sutton 2014-04-07 17:02:28 +01:00
parent 5c73e78c28
commit dfeb0cee47
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/input/mpegts/mpegts_mux_dvb.c
View 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;