fix comments in override.conf.example

diff --git a/examples/override.conf.example b/examples/override.conf.example
index c14c576a77d95721bcb7140db4641d9c20b9e54b..3653012db0f4a0913ede04ae022d480686aa5057 100644 (file)
--- a/examples/override.conf.example
+++ b/examples/override.conf.example
@@ -52,9 +52,9 @@ cat:{S61.5W-S148W:}1816:0120  # DISH N3
 ; examples:
 ; ecmtable:{1234::}8E
 ;
-ecmtable:{1234::}8E       # DISH
-ecmtable:{1801:S82W:}8E    # BEV
-ecmtable:{1801:S91W:}8E    # BEV
+ecmtable:{1234::}8E       # BEV
+ecmtable:{1801:S82W:}8E   # DISH
+ecmtable:{1801:S91W:}8E   # DISH
 
 ;
 ; Define an alternative caid to use for EMM data.
@@ -66,7 +66,7 @@ ecmtable:{1801:S91W:}8E    # BEV
 ; emmcaid:{1234::}1801
 ; emmcaid:{1816:S61.5W-S148W:}1801
 ;
-emmcaid:{1234::}1801      # DISH
+emmcaid:{1234::}1801      # BEV
 
 ;
 ; Define alternative table for EMM data
@@ -80,4 +80,4 @@ emmcaid:{1234::}1801      # DISH
 ; emmtable:{1811:S19.2E:}82/FE
 ;
 emmtable:{1816:S61.5W-S148W:}83:84 # DISH N3
-emmtable:{1815:S61.5W-S148W:}83:84 # BEV N3
+emmtable:{1815:S82W-S91W:}83:84    # BEV N3

diff --git a/system.c b/system.c
index c29474f94ca14e0ef61082f5e7a4f3ea814c5e1d..28ed4cef06bc44ccab5550d33e07a917b9bd3dbe 100644 (file)
--- a/system.c
+++ b/system.c
@@ -172,7 +172,7 @@ void cSystem::ParseCAT(cPids *pids, const unsigned char *buffer, int source, int
         pids->AddPid(pid,0x80,0xFF,0x06);
         pids->AddPid(pid,0x88,0xFE);
         break;
-      case 0x18: // Nagra style, Nagra1(82) Nagra2(82/83) Nagra3(84/83)
+      case 0x18: // Nagra style (82/83)
         pids->AddPid(pid,0x82,0xFE);
         break;
       default:   // default style (82)