diff options
-rw-r--r-- | HISTORY | 1 | ||||
-rw-r--r-- | cutter.c | 4 | ||||
-rw-r--r-- | remux.h | 9 |
3 files changed, 5 insertions, 9 deletions
@@ -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. @@ -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) { @@ -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)) { |