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

mpegts: remove assigned mux instances when the input adapter is deleted

Browse source
This commit is contained in:
Jaroslav Kysela 2014-05-19 09:33:00 +02:00
parent e83b42cd6c
commit 094f9570b2
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/input/mpegts/mpegts_input.c
View file

@ -955,11 +955,21 @@ void
mpegts_input_delete ( mpegts_input_t *mi, int delconf )
{
mpegts_network_link_t *mnl;
mpegts_mux_instance_t *mmi, *mmi_next;
/* Remove networks */
while ((mnl = LIST_FIRST(&mi->mi_networks)))
mpegts_input_del_network(mnl);
/* Remove mux instances assigned to this input */
mmi = LIST_FIRST(&mi->mi_mux_instances);
while (mmi) {
mmi_next = LIST_NEXT(mmi, mmi_input_link);
if (mmi->mmi_input == mi)
mmi->mmi_delete(mmi);
mmi = mmi_next;
}
/* Remove global refs */
idnode_unlink(&mi->ti_id);
LIST_REMOVE(mi, ti_link);