diff options
| author | Ren, Zhaohan <zhaohan.ren@intel.com> | 2009-03-26 05:45:59 +0800 |
|---|---|---|
| committer | Ren, Zhaohan <zhaohan.ren@intel.com> | 2009-03-26 05:45:59 +0800 |
| commit | a02db9921e4647293850b11058f2df07ac5768f0 (patch) | |
| tree | 9254c466db7ae029effa23fb425f41cc72c16c4e | |
| parent | f82ef61b328133aaf72e8412cd8eb4bce0f4e490 (diff) | |
| parent | 5963c266fec4b741a4c9f3b7681419b2dad0c0ac (diff) | |
| download | libva-a02db9921e4647293850b11058f2df07ac5768f0.tar.gz | |
Merge branch 'master' of ssh://git@moblin-mdi.jf.intel.com/umg-moorestown-libva
| -rwxr-xr-x | src/X11/va_x11.h | 6 | ||||
| -rwxr-xr-x | src/va_backend.h | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/X11/va_x11.h b/src/X11/va_x11.h index e704de2..2171ac6 100755 --- a/src/X11/va_x11.h +++ b/src/X11/va_x11.h @@ -1,7 +1,11 @@ #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 diff --git a/src/va_backend.h b/src/va_backend.h index 7f1f6a2..b47e5ad 100755 --- 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> |