[PR-153] check the network id when matching encoding list entries

diff --git a/src/dvb/dvb_charset.c b/src/dvb/dvb_charset.c
index 5b9d92e2f349d5316ff4be9fe570d7c9b8b57eb0..85bdb69316661b0bdad320861373771d8d3917e5 100644 (file)
--- a/src/dvb/dvb_charset.c
+++ b/src/dvb/dvb_charset.c
@@ -79,11 +79,11 @@ void dvb_charset_init ( void )
  * Find default charset
  */
 const char *dvb_charset_find
-  ( uint16_t tsid, uint16_t sid )
+  ( uint16_t onid, uint16_t tsid, uint16_t sid )
 {
   dvb_charset_t *ret = NULL, *enc;
   LIST_FOREACH(enc, &dvb_charset_list, link) {
-    if (tsid == enc->tsid) {
+    if (onid == enc->onid && tsid == enc->tsid) {
       if (sid == enc->sid) {
          ret = enc;
         break;

diff --git a/src/dvb/dvb_charset.h b/src/dvb/dvb_charset.h
index 47dc66e7d18e5a1edd8b1b59c00a22fe9caaa78d..9ea83022d1cc3e5f212695c4df18cd0bb9844860 100644 (file)
--- a/src/dvb/dvb_charset.h
+++ b/src/dvb/dvb_charset.h
@@ -32,6 +32,6 @@ LIST_HEAD(,dvb_charset) dvb_charset_list;
 void dvb_charset_init ( void );
 
 const char *dvb_charset_find
-  (uint16_t tsid, uint16_t sid);
+  (uint16_t onid, uint16_t tsid, uint16_t sid);
 
 #endif /* __TVH_DVB_CHARSET_H__ */

diff --git a/src/epggrab/module/eit.c b/src/epggrab/module/eit.c
index 307a420dc32478a5a3976a03e09ba7abbf784f22..7efecf38cf42035f9fb1ed13bbbdbe47f98fc932 100644 (file)
--- a/src/epggrab/module/eit.c
+++ b/src/epggrab/module/eit.c
@@ -544,7 +544,8 @@ static int _eit_process_event
   /* Override */
   if (!ev.default_charset) {
     ev.default_charset
-      = dvb_charset_find(svc->s_dvb_mux_instance->tdmi_transport_stream_id,
+      = dvb_charset_find(svc->s_dvb_mux_instance->tdmi_network_id,
+                         svc->s_dvb_mux_instance->tdmi_transport_stream_id,
                          svc->s_dvb_service_id);
   }