Fixed handling zero bytes in cH264Parser

3 files changed, 5 insertions, 3 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d2821aae..398ef456 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2456,6 +2456,7 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for reporting that the edited recording is not deleted in case of an error
  for reporting missing '0x09=H.265 video, 0x19 = AC4 audio' in vdr.5
  for reporting a problem with the call to EpgHandlers.EndSegmentTransfer()
+ for fixing handling zero bytes in cH264Parser
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
diff --git a/HISTORY b/HISTORY
index cb2ee4c3..db4501fb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9766,10 +9766,11 @@ Video Disk Recorder Revision History
   (reported by Timo Weingärtner).
 - Official release.
 
-2022-01-14:
+2022-01-18:
 
 - Replaced strncpy() with memcpy() in strreplace() to avoid a compiler warning
   (reported by Marco Mäkelä).
 - Fixed starting replay after jumping to an editing mark.
 - Updated the Italian OSD texts (thanks to Diego Pierotto).
 - Added some missing "AUTO" values to vdr.5 (thanks to Winfried Köhler).
+- Fixed handling zero bytes in cH264Parser (thanks to Christoph Haubrich).
diff --git a/remux.c b/remux.c
index c338698d..0bfdbbea 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 5.1 2021/05/11 20:47:31 kls Exp $
+ * $Id: remux.c 5.2 2022/01/18 14:24:33 kls Exp $
  */
 
 #include "remux.h"
@@ -1363,7 +1363,7 @@ uchar cH264Parser::GetByte(bool Raw)
      else {
         if (b == 0x03 && zeroBytes >= 2)
            b = tsPayload.GetByte();
-        zeroBytes = 0;
+        zeroBytes = b ? 0 : 1;
         }
      }
   else