Initial import

1 files changed, 4 insertions, 3 deletions

diff --git a/tools/ts.h b/tools/ts.h
index 18d157ec..af5bfd6f 100644
--- a/tools/ts.h
+++ b/tools/ts.h
@@ -4,13 +4,14 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ts.h,v 1.1 2008-12-21 12:39:01 phintuka Exp $
+ * $Id: ts.h,v 1.2 2009-01-18 18:27:36 phintuka Exp $
  *
  */
 
 #ifndef _XINELIBOUTPUT_TS_H_
 #define _XINELIBOUTPUT_TS_H_
 
+/* Avoid warnings when included to VDR plugin */
 #undef TS_SYNC_BYTE
 #undef TS_SIZE
 #undef TS_PAYLOAD_EXISTS
@@ -33,11 +34,11 @@
 
 #define TS_HAS_PAYLOAD(ts)      ((ts)[3] & TS_PAYLOAD_EXISTS)
 #define TS_PAYLOAD_START(ts)    ((ts)[1] & TS_PAYLOAD_START)
-#define TS_ERROR(ts)            ((ts)[1] & TS_ERROR)
+#define TS_HAS_ERROR(ts)        ((ts)[1] & TS_ERROR)
 #define TS_PID(ts)            ((((ts)[1] & TS_PID_MASK_HI) << 8) + (ts)[2])
 #define TS_PAYLOAD_OFFSET(ts)  (((ts)[3] & TS_ADAPT_FIELD_EXISTS) ? (ts)[4] + 5 : 4)
 
-#define TS_PAYLOAD(ts)          ((ts) + TS_PAYLOAD_OFFSET(ts))
+#define TS_GET_PAYLOAD(ts)      ((ts) + TS_PAYLOAD_OFFSET(ts))
 #define TS_PAYLOAD_SIZE(ts)     (TS_SIZE - TS_PAYLOAD_OFFSET(ts))
 
 #define DATA_IS_TS(data)        ((data)[0] == TS_SYNC_BYTE)