From d4b4b831fc6671b5840fb0e1d9a3fc0a8ec84670 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Thu, 19 Sep 2013 11:02:52 +0100 Subject: [PATCH] mpegts: remove the wait for NIT in SDT processing This causes initial scans to time out where the SDT is waiting on mux information from. Given that we'll rescan these muxes anyway there is little point. The only downside is the single point of info muxes (like 11778V in the UK) may not get the opportunity to provide all the info they could, since we might miss service info until later. --- src/input/mpegts/dvb_psi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c index 1acd16f1..87129c43 100644 --- a/src/input/mpegts/dvb_psi.c +++ b/src/input/mpegts/dvb_psi.c @@ -875,10 +875,7 @@ dvb_sdt_callback LIST_FOREACH(mm, &mn->mn_muxes, mm_network_link) if (mm->mm_onid == onid && mm->mm_tsid == tsid) break; - if (!mm) { - tvhtrace("sdt", " waiting for NIT"); - return -1; - } + goto done; } /* Service loop */ @@ -987,6 +984,7 @@ dvb_sdt_callback } /* Done */ +done: return dvb_table_end(mt, st, sect); }