Simplify

[vlc] / include / vlc_config.h

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 3617fa7c3998b09702958235404239d178107799..bd8d2509963e84d412d013f78fb4187451b46f21 100644 (file)
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -44,10 +44,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
  *****************************************************************************/
@@ -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 */