X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_config.h;h=4a514355f238751cb3f93ae261374354044faa8e;hb=ea995e62ec0d3815adf9fbc60f2c36412e9156a0;hp=1293190361a7ad678aa7ef9f69cd473f3520a94f;hpb=db57d038feca775de1cded87d148602ae1568395;p=vlc

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 1293190361..4a514355f2 100644
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -22,9 +22,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
+/**
+ * \file
+ * This file defines of values used in interface, vout, aout and vlc core functions.
+ */
 
 /* Conventions regarding names of symbols and variables
  * ----------------------------------------------------
@@ -44,10 +45,6 @@
  * status */
 #define THREAD_SLEEP                    ((mtime_t)(0.010*CLOCK_FREQ))
 
-/* When a thread waits on a condition in debug mode, delay to wait before
- * outputting an error message (in second) */
-#define THREAD_COND_TIMEOUT             3
-
 /*****************************************************************************
  * Interface configuration
  *****************************************************************************/
@@ -64,7 +61,6 @@
  *****************************************************************************/
 
 #define DEFAULT_INPUT_ACTIVITY 1
-#define DIRECTORY_ACTIVITY 100
 #define TRANSCODE_ACTIVITY 10
 
 /* Used in ErrorThread */
@@ -115,7 +111,7 @@
 
 /* Buffers which arrive in advance of more than AOUT_MAX_ADVANCE_TIME
  * will be considered as bogus and be trashed */
-#define AOUT_MAX_ADVANCE_TIME           (mtime_t)(DEFAULT_PTS_DELAY * 3)
+#define AOUT_MAX_ADVANCE_TIME           (mtime_t)(DEFAULT_PTS_DELAY * 5)
 
 /* Buffers which arrive in advance of more than AOUT_MAX_PREPARE_TIME
  * will cause the calling thread to sleep */
@@ -152,11 +148,7 @@
 
 /* Video heap size - remember that a decompressed picture is big
  * (~1 Mbyte) before using huge values */
-#ifdef OPTIMIZE_MEMORY
-#   define VOUT_MAX_PICTURES               5
-#else
-#   define VOUT_MAX_PICTURES               8
-#endif
+#define VOUT_MAX_PICTURES               8
 
 /* Minimum number of direct pictures the video output will accept without
  * creating additional pictures in system memory */