From: Laurent Aimar <fenrir@videolan.org>
Date: Sat, 25 Apr 2009 20:05:15 +0000 (+0200)
Subject: Renamed BLOCK_TS_INVALID to VLC_TS_INVALID and put it in vlc_config.h
X-Git-Tag: 1.0.0-rc1~243
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1eee55ff877eef6fb2c910c4001bf1337f768ab3;p=vlc

Renamed BLOCK_TS_INVALID to VLC_TS_INVALID and put it in vlc_config.h

Sorry for the previous one.
---

diff --git a/include/vlc_block.h b/include/vlc_block.h
index 37d21badf0..aa49c65228 100644
--- a/include/vlc_block.h
+++ b/include/vlc_block.h
@@ -37,7 +37,7 @@
  * - i_flags may not always be set (ie could be 0, even for a key frame
  *      it depends where you receive the buffer (before/after a packetizer
  *      and the demux/packetizer implementations.
- * - i_dts/i_pts could be BLOCK_TS_INVALID, it means no pts/dts
+ * - i_dts/i_pts could be VLC_TS_INVALID, it means no pts/dts
  * - i_length: length in microseond of the packet, can be null except in the
  *      sout where it is mandatory.
  * - i_rate 0 or a valid input rate, look at vlc_input.h
@@ -90,10 +90,6 @@ typedef struct block_sys_t block_sys_t;
 #define BLOCK_FLAG_PRIVATE_MASK  0xff000000
 #define BLOCK_FLAG_PRIVATE_SHIFT 24
 
-/* All timestamp below or equal to this define are invalid/unset
- * XXX the numerical value is 0 because of historical reason and will change.*/
-#define BLOCK_TS_INVALID (0)
-
 typedef void (*block_free_t) (block_t *);
 
 struct block_t
diff --git a/include/vlc_config.h b/include/vlc_config.h
index 496b883fed..77709e7306 100644
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -38,8 +38,11 @@
  * General configuration
  *****************************************************************************/
 
-#define CLOCK_FREQ 1000000
+/* All timestamp below or equal to this define are invalid/unset
+ * XXX the numerical value is 0 because of historical reason and will change.*/
+#define VLC_TS_INVALID (0)
 
+#define CLOCK_FREQ 1000000
 
 /* When creating or destroying threads in blocking mode, delay to poll thread
  * status */
diff --git a/src/misc/block.c b/src/misc/block.c
index c60ce45980..099c31e226 100644
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -59,7 +59,8 @@ void block_Init( block_t *restrict b, void *buf, size_t size )
     /* Fill all fields to their default */
     b->p_next = NULL;
     b->i_flags = 0;
-    b->i_pts = b->i_dts = BLOCK_TS_INVALID;
+    b->i_pts =
+    b->i_dts = VLC_TS_INVALID;
     b->i_length = 0;
     b->i_rate = 0;
     b->p_buffer = buf;