The PCR pid in generated PMTs is now set to the channel's PCR pid again

2 files changed, 7 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index d389f6fb..9d4bd36b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6276,7 +6276,7 @@ Video Disk Recorder Revision History
 - Fixed plugin arguments corruption with glibc 2.11 on x86_64 (thanks to
   Anssi Hannula).
 
-2010-01-23: Version 1.7.12
+2010-01-24: Version 1.7.12
 
 - Changed the EVCONTENTMASK_* macros to enums and changed "mask" to "group".
 - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
@@ -6296,3 +6296,7 @@ Video Disk Recorder Revision History
   to Matti Lehtimäki).
 - Fixed determining the frame duration on channels where the PTS deltas jitter by
   +/-1 around 1800.
+- The PCR pid in generated PMTs is now set to the channel's PCR pid again, which
+  in most cases is the same as the video pid. For channels that use a separate
+  PCR pid, no TS packets are recorded from that PID (I have yet to see a case where
+  this actually is a problem).
diff --git a/remux.c b/remux.c
index 5c41e3cb..1f71fb3c 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.38 2010/01/23 15:39:15 kls Exp $
+ * $Id: remux.c 2.39 2010/01/24 15:18:29 kls Exp $
  */
 
 #include "remux.h"
@@ -295,7 +295,7 @@ void cPatPmtGenerator::GeneratePmt(cChannel *Channel)
   numPmtPackets = 0;
   if (Channel) {
      int Vpid = Channel->Vpid();
-     int Ppid = 0x1FFF; // no PCR pid
+     int Ppid = Channel->Ppid();
      uchar *p = buf;
      int i = 0;
      p[i++] = 0x02; // table id