summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2017-05-21 09:53:27 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2017-05-21 09:53:27 +0200
commit3b1b5bde681febf6a3900438fbc2d386511c4393 (patch)
treec5366208fb27c2b8b2281f0eebf52af44a10e676
parent82813f48c4f95d8cedbd2add70baf7962aad2ca1 (diff)
downloadvdr-3b1b5bde681febf6a3900438fbc2d386511c4393.tar.gz
vdr-3b1b5bde681febf6a3900438fbc2d386511c4393.tar.bz2
Removed TsGetContinuityCounter() from remux.h, using TsContinuityCounter() instead
-rw-r--r--HISTORY1
-rw-r--r--cutter.c4
-rw-r--r--remux.h9
3 files changed, 5 insertions, 9 deletions
diff --git a/HISTORY b/HISTORY
index 97e9ab16..a9a897f9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9042,3 +9042,4 @@ Video Disk Recorder Revision History
VDR's tools.h, you can insert
#define VDR_NO_STL_PROTOTYPES
before including tools.h.
+- Removed TsGetContinuityCounter() from remux.h, using TsContinuityCounter() instead.
diff --git a/cutter.c b/cutter.c
index 587fddf0..67dc4ef5 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 4.2 2015/08/09 12:24:28 kls Exp $
+ * $Id: cutter.c 4.3 2017/05/21 09:45:06 kls Exp $
*/
#include "cutter.h"
@@ -500,7 +500,7 @@ bool cCuttingThread::FixFrame(uchar *Data, int &Length, bool Independent, int In
TsSetContinuityCounter(p, counter[Pid]);
}
else
- counter[Pid] = TsGetContinuityCounter(p); // collect initial counters
+ counter[Pid] = TsContinuityCounter(p); // collect initial counters
// Adjust PTS:
int64_t Pts = TsGetPts(p, TS_SIZE);
if (Pts >= 0) {
diff --git a/remux.h b/remux.h
index 1bd96d9b..eea8a844 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: remux.h 4.4 2017/04/29 11:56:21 kls Exp $
+ * $Id: remux.h 4.5 2017/05/21 09:44:52 kls Exp $
*/
#ifndef __REMUX_H
@@ -95,7 +95,7 @@ inline bool TsIsScrambled(const uchar *p)
return p[3] & TS_SCRAMBLING_CONTROL;
}
-inline uchar TsGetContinuityCounter(const uchar *p)
+inline uchar TsContinuityCounter(const uchar *p)
{
return p[3] & TS_CONT_CNT_MASK;
}
@@ -121,11 +121,6 @@ inline int TsGetPayload(const uchar **p)
return 0;
}
-inline int TsContinuityCounter(const uchar *p)
-{
- return p[3] & TS_CONT_CNT_MASK;
-}
-
inline int64_t TsGetPcr(const uchar *p)
{
if (TsHasAdaptationField(p)) {