summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAustin Yuan <shengquan.yuan@intel.com>2009-03-26 19:17:03 -0400
committerAustin Yuan <shengquan.yuan@intel.com>2009-03-26 19:17:03 -0400
commitd8618bcda880ef1134384de6482026ea14926d58 (patch)
tree725fd82d5789147310e9b4b730348c22ae26b32c /src
parent8d3eb7071e39c441f03224b3c91fabe01fc818b1 (diff)
Revert "patch 108_drivers_path.patch"04032009
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am3
-rw-r--r--src/va.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 83d75e6..06aeaff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,8 +22,7 @@
INCLUDES = \
$(LIBVA_CFLAGS) \
- -DIN_LIBVA \
- -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
+ -DIN_LIBVA
libva_la_LTLIBRARIES = libva.la
libva_ladir = $(libdir)
diff --git a/src/va.c b/src/va.c
index c8de749..1f6b1fe 100644
--- a/src/va.c
+++ b/src/va.c
@@ -36,7 +36,7 @@
#define VA_MINOR_VERSION 30
#define DRIVER_INIT_FUNC "__vaDriverInit_0_30"
-#define DEFAULT_DRIVER_DIR "/usr/X11R6/lib/modules/dri"
+#define DEFAULT_DRIVER_DIR "/usr/lib/dri/"
#define DRIVER_EXTENSION "_drv_video.so"
#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
@@ -128,7 +128,7 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
}
if (!search_path)
{
- search_path = VA_DRIVERS_PATH;
+ search_path = DEFAULT_DRIVER_DIR;
}
search_path = strdup(search_path);