[vlc-devel] commit: Removed check on OPTIMIZE_MEMORY in installed headers. ( Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Nov  2 17:50:14 2008 +0100| [3e356e56b23267a91a9e682cc63115926da77600] | committer: Laurent Aimar 

Removed check on OPTIMIZE_MEMORY in installed headers.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e356e56b23267a91a9e682cc63115926da77600
---

 include/vlc_config.h                |   19 ++-----------------
 src/video_output/vout_subpictures.c |    3 +++
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 269c6ce..c61b52f 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 6a4d70d..697bf7d 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')