From 9d17559caf8c61fc687f6d13f4dbf64f9b001e8d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 12 Apr 2008 14:14:07 +0200
Subject: [PATCH] Fixed handling the counter in detection of pre 1.3.19 PS data

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

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index abaeeef9..976e43c4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1175,6 +1175,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for pointing out that cDevice::Transferring() doesn't return the right value in the
  early stage of channel switching
  for fixing displaying transponder data when it is modified
+ for fixing handling the counter in detection of pre 1.3.19 PS data
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
diff --git a/HISTORY b/HISTORY
index 2a1091d6..5181cba7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5739,3 +5739,5 @@ Video Disk Recorder Revision History
   want to make sure you have a backup of this file in case you need to go back to
   the previous version of VDR!
 - Fixed displaying transponder data when it is modified (thanks to Reinhard Nissl).
+- Fixed handling the counter in detection of pre 1.3.19 PS data (thanks to Reinhard
+  Nissl).
diff --git a/device.c b/device.c
index 420d9a50..12b8dd95 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.1 2008/04/12 11:15:32 kls Exp $
+ * $Id: device.c 2.2 2008/04/12 14:12:14 kls Exp $
  */
 
 #include "device.h"
@@ -1294,7 +1294,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                uchar SubStreamIndex = SubStreamId & 0x1F;
 
                // Compatibility mode for old VDR recordings, where 0xBD was only AC3:
-pre_1_3_19_PrivateStreamDeteced:
+pre_1_3_19_PrivateStreamDetected:
                if (pre_1_3_19_PrivateStream > MIN_PRE_1_3_19_PRIVATESTREAM) {
                   SubStreamId = c;
                   SubStreamType = 0x80;
@@ -1335,7 +1335,8 @@ pre_1_3_19_PrivateStreamDeteced:
                          if (pre_1_3_19_PrivateStream > MIN_PRE_1_3_19_PRIVATESTREAM) {
                             dsyslog("switching to pre 1.3.19 Dolby Digital compatibility mode - substream id = %02X", SubStreamId);
                             ClrAvailableTracks();
-                            goto pre_1_3_19_PrivateStreamDeteced;
+                            pre_1_3_19_PrivateStream = MIN_PRE_1_3_19_PRIVATESTREAM + 1;
+                            goto pre_1_3_19_PrivateStreamDetected;
                             }
                          }
                  }