• R/O
  • HTTP
  • SSH
  • HTTPS

提交

标签
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

hardware/intel/libva


Commit MetaInfo

修订版a02db9921e4647293850b11058f2df07ac5768f0 (tree)
时间2009-03-26 06:45:59
作者Ren, Zhaohan <zhaohan.ren@inte...>
CommiterRen, Zhaohan

Log Message

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

更改概述

差异

--- a/src/X11/va_x11.h
+++ b/src/X11/va_x11.h
@@ -1,7 +1,11 @@
11 #ifndef _VA_X11_H_
22 #define _VA_X11_H_
33
4-#include <va.h>
4+#ifdef IN_LIBVA
5+#include "va.h"
6+#else
7+#include <va/va.h>
8+#endif
59 #include <X11/Xlib.h>
610
711 #ifdef __cplusplus
--- a/src/va_backend.h
+++ b/src/va_backend.h
@@ -29,8 +29,13 @@
2929 #ifndef _VA_BACKEND_H_
3030 #define _VA_BACKEND_H_
3131
32+#ifdef IN_LIBVA
3233 #include "va.h"
3334 #include "X11/va_x11.h"
35+#else
36+#include <va/va.h>
37+#include <X11/va_x11.h>
38+#endif
3439
3540 #include <stdlib.h>
3641