Commit 3e356e56 authored by Laurent Aimar's avatar Laurent Aimar

Removed check on OPTIMIZE_MEMORY in installed headers.

parent 60bba9e0
...@@ -148,26 +148,11 @@ ...@@ -148,26 +148,11 @@
/* Video heap size - remember that a decompressed picture is big /* Video heap size - remember that a decompressed picture is big
* (~1 Mbyte) before using huge values */ * (~1 Mbyte) before using huge values */
#ifdef OPTIMIZE_MEMORY #define VOUT_MAX_PICTURES 16
# define VOUT_MAX_PICTURES 8
#else
# define VOUT_MAX_PICTURES 16
#endif
/* Minimum number of direct pictures the video output will accept without /* Minimum number of direct pictures the video output will accept without
* creating additional pictures in system memory */ * creating additional pictures in system memory */
#ifdef OPTIMIZE_MEMORY #define VOUT_MIN_DIRECT_PICTURES 12
# 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
/* Statistics are displayed every n loops (=~ pictures) */ /* Statistics are displayed every n loops (=~ pictures) */
#define VOUT_STATS_NB_LOOPS 100 #define VOUT_STATS_NB_LOOPS 100
......
...@@ -44,6 +44,9 @@ ...@@ -44,6 +44,9 @@
/***************************************************************************** /*****************************************************************************
* Local prototypes * 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_YUVP VLC_FOURCC('Y','U','V','P')
#define VLC_FOURCC_YUVA VLC_FOURCC('Y','U','V','A') #define VLC_FOURCC_YUVA VLC_FOURCC('Y','U','V','A')
#define VLC_FOURCC_RGBA VLC_FOURCC('R','G','B','A') #define VLC_FOURCC_RGBA VLC_FOURCC('R','G','B','A')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment