From 0f10c8824c780cdab960aa432297f8bb34dcf769 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 5 May 2019 13:59:03 +0200
Subject: [PATCH] Fixed mapping SIDs in MTD

---
 CONTRIBUTORS | 1 +
 HISTORY      | 1 +
 mtd.c        | 7 +++++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c3a776ec..786b6804 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3579,6 +3579,7 @@ Helmut Binder <cco@aon.at>
  for fixing triggering the SDT filter when parsing the NIT
  for reporting a bug in processing SI::T2DeliverySystemDescriptor when typecasting it
  over an SI::ExtensionDescriptor
+ for fixing mapping SIDs in MTD
 
 Ulrich Eckhardt <uli@uli-eckhardt.de>
  for reporting a problem with shutdown after user inactivity in case a plugin is
diff --git a/HISTORY b/HISTORY
index 847d09e5..b8cb2373 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9394,3 +9394,4 @@ Video Disk Recorder Revision History
   recordings, so that other VDRs that use the same video directory will update their
   list of (deleted) recordings and thus won't display too much empty disk space.
 - Fixed the install target in case of multiple jobs (thanks to Chris Mayo).
+- Fixed mapping SIDs in MTD (thanks to Helmut Binder).
diff --git a/mtd.c b/mtd.c
index 04bf09df..ae07548d 100644
--- a/mtd.c
+++ b/mtd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: mtd.c 1.12 2017/10/31 12:16:39 kls Exp $
+ * $Id: mtd.c 1.13 2019/05/05 13:56:46 kls Exp $
  */
 
 #include "mtd.h"
@@ -224,7 +224,10 @@ void cMtdMapper::Clear(void)
 
 void MtdMapSid(uchar *p, cMtdMapper *MtdMapper)
 {
-  Poke13(p, MtdMapper->RealToUniqSid(Peek13(p)));
+  uint16_t RealSid = p[0] << 8 | p[1];
+  uint16_t UniqSid = MtdMapper->RealToUniqSid(RealSid);
+  p[0] = UniqSid >> 8;
+  p[1] = UniqSid & 0xff;
 }
 
 void MtdMapPid(uchar *p, cMtdMapper *MtdMapper)