projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'origin/master' into pipe-video
[mesa.git]
/
src
/
gallium
/
state_trackers
/
xorg
/
xvmc
/
surface.c
diff --git
a/src/gallium/state_trackers/xorg/xvmc/surface.c
b/src/gallium/state_trackers/xorg/xvmc/surface.c
index 4d6c5246b5e783ebea8e33fdabc6cb33042b8196..db630c9e790f422524226c090db37399dfb1296f 100644
(file)
--- a/
src/gallium/state_trackers/xorg/xvmc/surface.c
+++ b/
src/gallium/state_trackers/xorg/xvmc/surface.c
@@
-31,7
+31,7
@@
#include <pipe/p_video_context.h>
#include <pipe/p_video_state.h>
#include <pipe/p_state.h>
-#include <
pipe/p
_inlines.h>
+#include <
util/u
_inlines.h>
#include <util/u_memory.h>
#include "xvmc_private.h"