From: Mariusz Bialonczyk <manio@skyboo.net>
Date: Wed, 10 Oct 2012 12:13:07 +0000 (+0200)
Subject: [PR-153] check the network id when matching encoding list entries
X-Git-Tag: v3.5~380
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7faccbaf66efc211f89a77cd9eddb81d3725e151;p=thirdparty%2Ftvheadend.git

[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 5b9d92e2f..85bdb6931 100644
--- 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 47dc66e7d..9ea83022d 100644
--- 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 307a420dc..7efecf38c 100644
--- 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);
   }