X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_config.h;h=316179a38d8a9d5ab01512a2818b5e1dbcbdbc32;hb=6a66117a34f627ad9560b07cead07663b48f23b6;hp=81eb4d00e1f39cb0a4995377da7b9ccd3532480d;hpb=b2060480374a36794958855d153d48801d18ea5f;p=vlc

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 81eb4d00e1..316179a38d 100644
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -22,10 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
 /* Conventions regarding names of symbols and variables
  * ----------------------------------------------------
  *
@@ -60,7 +56,6 @@
  *****************************************************************************/
 
 #define DEFAULT_INPUT_ACTIVITY 1
-#define DIRECTORY_ACTIVITY 100
 #define TRANSCODE_ACTIVITY 10
 
 /* Used in ErrorThread */
@@ -148,11 +143,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 */