From 1b69e8166f8732d5a276ff9d2a6697244a42b95a Mon Sep 17 00:00:00 2001
From: Gwenole Beauchesne <address@hidden>
Date: Wed, 19 May 2010 08:36:33 +0000
Subject: [PATCH 4/4] Drop wrong VA driver name check/hack.

---
 gui/gtk.cpp |   24 +++---------------------
 1 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/gui/gtk.cpp b/gui/gtk.cpp
index 75640cf..e6bb6ba 100644
--- a/gui/gtk.cpp
+++ b/gui/gtk.cpp
@@ -37,14 +37,13 @@
 #include "gnash.h" // Quality
 
 #include <iostream>
+
 #ifdef HAVE_VA_VA_H
-#include "va/va.h"
-#include "va/va_backend.h"
+#include <va/va.h>
 #include "vaapi_utils.h"
 #endif
-
 #ifdef HAVE_VA_VA_X11_H
-#include "va/va_x11.h"
+#include <va/va_x11.h>
 #endif
 
 #ifdef HAVE_X11
@@ -259,23 +258,6 @@ GtkGui::init(int argc, char **argv[])
         }
     }
 
-#ifdef HAVE_VA_VA_X11_H
-    if (hwaccel == "vaapi") {
-        char *driver_name;
-        struct VADisplayContext *pDisplayContext = (struct VADisplayContext *)vaGetDisplay(GDK_DISPLAY());
-        
-        if (pDisplayContext->vaGetDriverName(pDisplayContext, &driver_name) == 0) {
-            if ((strcmp(driver_name, "nvidia" ) == 0) || (strcmp(driver_name, "vdpau" ) == 0) || (strcmp(driver_name, "s3g" ) == 0)) {
-                log_debug("Found supported vaapi driver for %s", driver_name);
-            } else {
-                log_error("No vaapi driver found for %s!", driver_name);
-            }
-        } else {
-            log_error("Couldn't get the VAAPI driver name!");
-        }
-    }
-#endif
-
 #ifdef BUILD_CANVAS
     _canvas = gnash_canvas_new();
     gnash_canvas_setup(GNASH_CANVAS(_canvas), hwaccel, renderer, argc, argv);
-- 
1.7.0.4