Now also using FindHeader() in cMpeg2Fixer::AdjTref()

4 files changed, 10 insertions, 8 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 39bc0d38..d87a03e2 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3025,6 +3025,7 @@ Sören Moch <smoch@web.de>
  for simplifying calculating the PTS offset in cPtsFixer::Fix() and fixing the overflow
  handling of PCR values
  for improving cutting MPEG-2 video
+ for pointing out that FindHeader() can also be used in cMpeg2Fixer::AdjTref()
 
 Peter Münster <pmlists@free.fr>
  for fixing 'make install' to not overwrite existing configuration files
diff --git a/HISTORY b/HISTORY
index 11cad93e..83a903d1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7533,3 +7533,7 @@ Video Disk Recorder Revision History
 - Improved cutting MPEG-2 video (thanks to Sören Moch).
 - Reduced the number of retries in cTransfer::Receive() to avoid blocking recordings
   in case the primary device can't handle the current live signal.
+
+2013-01-23: Version 1.7.37
+
+- Now also using FindHeader() in cMpeg2Fixer::AdjTref() (pointed out by Sören Moch).
diff --git a/config.h b/config.h
index 807850fb..5832c1df 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.60 2012/12/30 13:08:41 kls Exp $
+ * $Id: config.h 2.61 2013/01/22 17:08:50 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,8 +22,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.36"
-#define VDRVERSNUM   10736  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.37"
+#define VDRVERSNUM   10737  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/cutter.c b/cutter.c
index 8a6efc54..edb28248 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.22 2013/01/20 12:04:07 kls Exp $
+ * $Id: cutter.c 2.23 2013/01/23 10:39:27 kls Exp $
  */
 
 #include "cutter.h"
@@ -206,11 +206,8 @@ void cMpeg2Fixer::AdjGopTime(int Offset, int FramesPerSecond)
 
 void cMpeg2Fixer::AdjTref(int TrefOffset)
 {
-  Reset();
-  if (!Find(0x00000100)) {
-     esyslog("ERROR: Picture header not found!");
+  if (!FindHeader(0x00000100, "picture"))
      return;
-     }
   int Tref = GetByte() << 2;
   int Index1 = GetLastIndex();
   uchar Byte2 = GetByte();