Moved VOUT_MIN_DIRECT_PICTURES to src/video_output.

diff --git a/include/vlc_config.h b/include/vlc_config.h
index c61b52f850adafe2e43373a137d3e2c6482ccbad..496b883fed867c6be233604fa66e70b0e1f7aea5 100644 (file)
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -150,10 +150,6 @@
  * (~1 Mbyte) before using huge values */
 #define VOUT_MAX_PICTURES              16
 
-/* Minimum number of direct pictures the video output will accept without
- * creating additional pictures in system memory */
-#define VOUT_MIN_DIRECT_PICTURES        12
-
 /* Statistics are displayed every n loops (=~ pictures) */
 #define VOUT_STATS_NB_LOOPS             100
 

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 9a8d738cad92797b087ca6fc350d05d1ec680972..8c58747cd0daa13ce6bf4341bacf587147d3d1b2 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -106,6 +106,14 @@ static void DisplayTitleOnOSD( vout_thread_t *p_vout );
 /* Better be in advance when awakening than late... */
 #define VOUT_MWAIT_TOLERANCE            ((mtime_t)(0.020*CLOCK_FREQ))
 
+/* Minimum number of direct pictures the video output will accept without
+ * creating additional pictures in system memory */
+#ifdef OPTIMIZE_MEMORY
+#   define VOUT_MIN_DIRECT_PICTURES        (VOUT_MAX_PICTURES/2)
+#else
+#   define VOUT_MIN_DIRECT_PICTURES        (3*VOUT_MAX_PICTURES/4)
+#endif
+
 /*****************************************************************************
  * Video Filter2 functions
  *****************************************************************************/