From 3a19051c76ef19706e227ab971184a0e77a23e3c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 20 Aug 2011 09:07:26 +0200
Subject: Fixed detecting frames for channels that split frames into several
 payloads

---
 CONTRIBUTORS |  2 ++
 HISTORY      |  5 +++++
 config.h     | 10 +++++-----
 remux.c      |  6 ++++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2aa2c21d..6f445a0e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2593,6 +2593,8 @@ Derek Kelly (user.vdr@gmail.com)
  for reporting a problem with the fps value in the info file of a recording being
  overwritten in case a recording was interrupted and resumed, and the fps value
  could not be determined after resuming recording
+ for reporting a problem with detecting frames for channels that split frames into
+ several payloads
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
diff --git a/HISTORY b/HISTORY
index b5006894..0ea32af1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6698,3 +6698,8 @@ Video Disk Recorder Revision History
 - cTimeMs is no longer initialized to the current time if the value given to the
   constructor is negative (avoids the "cTimeMs: using monotonic clock..." log message
   before VDR's starting log message).
+
+2011-08-20: Version 1.7.21
+
+- Fixed detecting frames for channels that split frames into several payloads
+  (reported by Derek Kelly).
diff --git a/config.h b/config.h
index 19f87686..c51e3df7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.33 2011/06/21 21:43:01 kls Exp $
+ * $Id: config.h 2.34 2011/08/20 08:51:47 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.20"
-#define VDRVERSNUM   10720  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.21"
+#define VDRVERSNUM   10721  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.20"
-#define APIVERSNUM   10720  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.21"
+#define APIVERSNUM   10721  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/remux.c b/remux.c
index f174f614..28188bd6 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.58 2011/08/15 09:50:14 kls Exp $
+ * $Id: remux.c 2.59 2011/08/20 09:07:26 kls Exp $
  */
 
 #include "remux.h"
@@ -974,8 +974,10 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                                      payloadUnitOfFrame = (payloadUnitOfFrame + 1) % -framesPerPayloadUnit;
                                      if (payloadUnitOfFrame != 0 && independentFrame)
                                         payloadUnitOfFrame = 0;
-                                     if (payloadUnitOfFrame)
+                                     if (payloadUnitOfFrame) {
+                                        newPayload = false;
                                         newFrame = false;
+                                        }
                                      }
                                   if (framesPerPayloadUnit <= 1)
                                      scanning = false;
-- 
cgit v1.2.3