Updated setup menu video drivers list

2 files changed, 28 insertions, 13 deletions

diff --git a/config.c b/config.c
index 8f4ec7c4..90a12684 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c,v 1.108 2012-01-19 08:13:35 phintuka Exp $
+ * $Id: config.c,v 1.109 2012-01-19 08:18:26 phintuka Exp $
  *
  */
 
@@ -115,7 +115,18 @@ const char * const config_t::s_audioDriverNames[ AUDIO_DRIVER_count+1 ] = {
 };
 
 const char * const config_t::s_videoDriversX11[ X11_DRIVER_count+1 ] =  {
-  "auto", "xshm", "xv", "xvmc", "xxmc", "vidix", "XDirectFB", "opengl", "sdl", "none",
+  "auto",
+  "xshm",
+  "xv",
+  "vaapi",
+  "vdpau",
+  "opengl",
+  "xvmc",
+  "xxmc",
+  "sdl",
+  "XDirectFB",
+  "vidix",
+  "none",
   NULL
 };
 
@@ -123,12 +134,14 @@ const char * const config_t::s_videoDriverNamesX11[ X11_DRIVER_count+1 ] =  {
   trNOOP("automatic"),
   "XShm",
   "Xv",
+  "VAAPI",
+  "VDPAU",
+  "OpenGL",
   "XvMC",
   "XvMC+VLD",
-  "Vidix",
-  "XDirectFB",
-  "OpenGL",
   "SDL",
+  "XDirectFB",
+  "Vidix",
   trNOOP("no video"),
   NULL
 };
diff --git a/config.h b/config.h
index 836e48aa..0c95e15a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h,v 1.82 2012-01-16 11:57:53 phintuka Exp $
+ * $Id: config.h,v 1.83 2012-01-19 08:18:26 phintuka Exp $
  *
  */
 
@@ -76,14 +76,16 @@
 #define X11_DRIVER_AUTO          0
 #define X11_DRIVER_XSHM          1
 #define X11_DRIVER_XV            2
-#define X11_DRIVER_XVMC          3
-#define X11_DRIVER_XXMC          4
-#define X11_DRIVER_VIDIX         5
-#define X11_DRIVER_DIRECTFB      6
-#define X11_DRIVER_OPENGL        7
+#define X11_DRIVER_VAAPI         3
+#define X11_DRIVER_VDPAU         4
+#define X11_DRIVER_OPENGL        5
+#define X11_DRIVER_XVMC          6
+#define X11_DRIVER_XXMC          7
 #define X11_DRIVER_SDL           8
-#define X11_DRIVER_NONE          9
-#define X11_DRIVER_count         10
+#define X11_DRIVER_DIRECTFB      9
+#define X11_DRIVER_VIDIX         10
+#define X11_DRIVER_NONE          11
+#define X11_DRIVER_count         12
 
 #define FB_DRIVER_AUTO           0
 #define FB_DRIVER_FB             1