From b57eae00d387e24f0dc1882efeb7ecf070957cf7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 18 Apr 2003 11:29:11 +0200
Subject: [PATCH] Fixed handling Ca descriptors

---
 HISTORY | 3 ++-
 eit.c   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/HISTORY b/HISTORY
index 95e4834c..c7c76f5d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2034,7 +2034,8 @@ Video Disk Recorder Revision History
 - Fixed handling of Ca parameters with values <= MAXDEVICES, which don't indicate
   an actual encrypted channel (thanks to Stefan Huelswitt for reporting this one).
 
-2003-04-13: Version 1.1.28
+2003-04-18: Version 1.1.28
 
 - Using masks in EIT filtering to reduce the number of filters (thanks to Andreas
   Schultz).
+- Fixed handling Ca descriptors (thanks to Stefan Huelswitt).
diff --git a/eit.c b/eit.c
index 7dd77108..de52e7c6 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.69 2003/04/13 14:06:25 kls Exp $
+ * $Id: eit.c 1.70 2003/04/18 11:29:11 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1029,7 +1029,7 @@ cCaDescriptor::cCaDescriptor(int Source, int Transponder, int ServiceId, int CaS
   data[1] = length - 2;
   data[2] = (caSystem >> 8) & 0xFF;
   data[3] =  caSystem       & 0xFF;
-  data[4] = ((CaPid   >> 8) & 0xFF) | 0xE0;
+  data[4] = ((CaPid   >> 8) & 0x1F) | 0xE0;
   data[5] =   CaPid         & 0xFF;
   if (Length)
      memcpy(&data[6], Data, Length);