From 304a6ce26e7eefdcefeebd4cc1148ae57abfa2f9 Mon Sep 17 00:00:00 2001
From: Adam Sutton <dev@adamsutton.me.uk>
Date: Mon, 15 Oct 2012 10:53:47 +0100
Subject: [PATCH] Revert "[PR-153] check the network id when matching encoding
 list entries"

This reverts commit 091a4d608b4b3e398b0907ed4e99a59970f2fdba.
---
 src/dvb/dvb_charset.c    | 4 ++--
 src/dvb/dvb_charset.h    | 2 +-
 src/epggrab/module/eit.c | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/dvb/dvb_charset.c b/src/dvb/dvb_charset.c
index 85bdb693..5b9d92e2 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 onid, uint16_t tsid, uint16_t sid )
+  ( uint16_t tsid, uint16_t sid )
 {
   dvb_charset_t *ret = NULL, *enc;
   LIST_FOREACH(enc, &dvb_charset_list, link) {
-    if (onid == enc->onid && tsid == enc->tsid) {
+    if (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 9ea83022..47dc66e7 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 onid, uint16_t tsid, uint16_t sid);
+  (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 7efecf38..307a420d 100644
--- a/src/epggrab/module/eit.c
+++ b/src/epggrab/module/eit.c
@@ -544,8 +544,7 @@ static int _eit_process_event
   /* Override */
   if (!ev.default_charset) {
     ev.default_charset
-      = dvb_charset_find(svc->s_dvb_mux_instance->tdmi_network_id,
-                         svc->s_dvb_mux_instance->tdmi_transport_stream_id,
+      = dvb_charset_find(svc->s_dvb_mux_instance->tdmi_transport_stream_id,
                          svc->s_dvb_service_id);
   }