From: Laurent Aimar <fenrir@videolan.org>
Date: Sun, 2 Nov 2008 16:50:14 +0000 (+0100)
Subject: Removed check on OPTIMIZE_MEMORY in installed headers.
X-Git-Tag: 1.0.0-pre1~2259
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3e356e56b23267a91a9e682cc63115926da77600;p=vlc

Removed check on OPTIMIZE_MEMORY in installed headers.
---

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 269c6ce592..c61b52f850 100644
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -148,26 +148,11 @@
 
 /* Video heap size - remember that a decompressed picture is big
  * (~1 Mbyte) before using huge values */
-#ifdef OPTIMIZE_MEMORY
-#   define VOUT_MAX_PICTURES               8
-#else
-#   define VOUT_MAX_PICTURES              16
-#endif
+#define VOUT_MAX_PICTURES              16
 
 /* 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        6
-#else
-#   define VOUT_MIN_DIRECT_PICTURES        12
-#endif
-
-/* Number of simultaneous subpictures */
-#ifdef OPTIMIZE_MEMORY
-#   define VOUT_MAX_SUBPICTURES            8
-#else
-#   define VOUT_MAX_SUBPICTURES            16
-#endif
+#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/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 6a4d70d016..697bf7dd53 100644
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -44,6 +44,9 @@
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
+/* Number of simultaneous subpictures */
+#define VOUT_MAX_SUBPICTURES (VOUT_MAX_PICTURES)
+
 #define VLC_FOURCC_YUVP VLC_FOURCC('Y','U','V','P')
 #define VLC_FOURCC_YUVA VLC_FOURCC('Y','U','V','A')
 #define VLC_FOURCC_RGBA VLC_FOURCC('R','G','B','A')