Merge branch 'master' of ssh://git@moblin-mdi.jf.intel.com/umg-moorestown-libva

a02db992 · Ren, Zhaohan · f82ef61b · 5963c266 · a02db992 · a02db992
Commit a02db992 authored Mar 26, 2009 by Ren, Zhaohan
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

src/X11/va_x11.h src/X11/va_x11.h +5 -1

src/va_backend.h src/va_backend.h +5 -0

No files found.
--- a/src/X11/va_x11.h
+++ b/src/X11/va_x11.h
 #ifndef _VA_X11_H_
 #define _VA_X11_H_

-#include <va.h>
+#ifdef IN_LIBVA
+#include "va.h"
+#else
+#include <va/va.h>
+#endif
 #include <X11/Xlib.h>

 #ifdef __cplusplus

--- a/src/va_backend.h
+++ b/src/va_backend.h
@@ -29,8 +29,13 @@
 #ifndef _VA_BACKEND_H_
 #define _VA_BACKEND_H_

+#ifdef IN_LIBVA
 #include "va.h"
 #include "X11/va_x11.h"
+#else
+#include <va/va.h>
+#include <X11/va_x11.h>
+#endif

 #include <stdlib.h>