From b510e602720662f41c60339d225197cad569d9e7 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Sun, 17 Nov 2013 20:51:47 +0000 Subject: [PATCH] mpegts: ensure ONID/TSID are updated from NIT --- src/input/mpegts/dvb_psi.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c index e1920c2a..118e22e0 100644 --- a/src/input/mpegts/dvb_psi.c +++ b/src/input/mpegts/dvb_psi.c @@ -827,13 +827,18 @@ dvb_nit_callback /* nit only */ case DVB_DESC_SAT_DEL: - mux = dvb_desc_sat_del(mm, onid, tsid, dptr, dlen); - break; case DVB_DESC_CABLE_DEL: - mux = dvb_desc_cable_del(mm, onid, tsid, dptr, dlen); - break; case DVB_DESC_TERR_DEL: - mux = dvb_desc_terr_del(mm, onid, tsid, dptr, dlen); + if (dtag == DVB_DESC_SAT_DEL) + mux = dvb_desc_sat_del(mm, onid, tsid, dptr, dlen); + else if (dtag == DVB_DESC_CABLE_DEL) + mux = dvb_desc_cable_del(mm, onid, tsid, dptr, dlen); + else + mux = dvb_desc_terr_del(mm, onid, tsid, dptr, dlen); + if (mux) { + mpegts_mux_set_tsid(mux, tsid); + mpegts_mux_set_tsid(mux, onid); + } break; /* Both */