Use var_InheritString for --decklink-video-connection.

[vlc] / include / vlc_mtime.h

diff --git a/include/vlc_mtime.h b/include/vlc_mtime.h
index 477e7aa2264c28ac2031113656c2a6203296bfa6..8d51250dab38177845a3c4ff2fab79e30128506c 100644 (file)
--- a/include/vlc_mtime.h
+++ b/include/vlc_mtime.h
@@ -51,14 +51,6 @@
  *****************************************************************************/
 #define MSTRTIME_MAX_SIZE 22
 
-/* Well, Duh? But it does clue us in that we are converting from
-   millisecond quantity to a second quantity or vice versa.
-*/
-#define MILLISECONDS_PER_SEC 1000
-
-#define msecstotimestr(psz_buffer, msecs) \
-  secstotimestr( psz_buffer, (msecs / (int) MILLISECONDS_PER_SEC) )
-
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
@@ -66,14 +58,16 @@ VLC_EXPORT( char *,  mstrtime, ( char *psz_buffer, mtime_t date ) );
 VLC_EXPORT( mtime_t, mdate,    ( void ) );
 VLC_EXPORT( void,    mwait,    ( mtime_t date ) );
 VLC_EXPORT( void,    msleep,   ( mtime_t delay ) );
-VLC_EXPORT( char *,  secstotimestr, ( char *psz_buffer, int secs ) );
+VLC_EXPORT( char *,  secstotimestr, ( char *psz_buffer, int32_t secs ) );
 
-#if (defined (__GNUC__) && defined (__linux__)) || defined (__FreeBSD__) || defined (__OpenBSD__)
+# define VLC_HARD_MIN_SLEEP 10000   /* 10 milliseconds = 1 tick at 100Hz */
+
+#if defined (__GNUC__) \
+ && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
 /* Linux has 100, 250, 300 or 1000Hz
  *
  * HZ=100 by default on FreeBSD, but some architectures use a 1000Hz timer
  */
-# define VLC_HARD_MIN_SLEEP 10000   /* 10 milliseconds = 1 tick at 100Hz */
 # define VLC_SOFT_MIN_SLEEP 9000000 /* 9 seconds */
 
 static