DxVA2: add Mpeg1 VLD and VC-1 2010 VLD GUIDs

[vlc] / include / vlc_config.h

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 7c2fcf88d32d999035fffa60fe10bb0766a59403..ea047fe831e40b7a6b6b453dda24b21ae99f58ce 100644 (file)
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -78,17 +78,6 @@
  * mark it to be presented */
 #define DEFAULT_PTS_DELAY               (3*CLOCK_FREQ/10)
 
-/* DVD and VCD devices */
-#if !defined( WIN32 ) && !defined( UNDER_CE )
-#   define CD_DEVICE      "/dev/cdrom"
-#   define DVD_DEVICE     "/dev/dvd"
-#else
-#   define CD_DEVICE      "D:"
-#   define DVD_DEVICE     NULL
-#endif
-#define VCD_DEVICE        CD_DEVICE
-#define CDAUDIO_DEVICE    CD_DEVICE
-
 /*****************************************************************************
  * Audio configuration
  *****************************************************************************/
@@ -103,9 +92,6 @@
 /* Max number of pre-filters per input, and max number of post-filters */
 #define AOUT_MAX_FILTERS                10
 
-/* Max number of inputs */
-#define AOUT_MAX_INPUTS                 5
-
 /* Buffers which arrive in advance of more than AOUT_MAX_ADVANCE_TIME
  * will be considered as bogus and be trashed */
 #define AOUT_MAX_ADVANCE_TIME           (DEFAULT_PTS_DELAY * 5)
@@ -151,10 +137,6 @@
 /* Number of planes in a picture */
 #define VOUT_MAX_PLANES                 5
 
-/* Video heap size - remember that a decompressed picture is big
- * (~1 Mbyte) before using huge values */
-#define VOUT_MAX_PICTURES              16
-
 /*
  * Time settings
  */