projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3de4200
)
ximagesink: Fix coompiler error without HAVE_XSHM
author
Alexander Schrab
<alexas@axis.com>
Tue, 9 Apr 2013 10:27:48 +0000
(12:27 +0200)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Tue, 9 Apr 2013 18:02:08 +0000
(20:02 +0200)
https://bugzilla.gnome.org/show_bug.cgi?id=697628
sys/ximage/ximagepool.c
patch
|
blob
|
history
diff --git
a/sys/ximage/ximagepool.c
b/sys/ximage/ximagepool.c
index
f1312bc
..
6cc2cfa
100644
(file)
--- a/
sys/ximage/ximagepool.c
+++ b/
sys/ximage/ximagepool.c
@@
-170,7
+170,9
@@
ximage_memory_share (GstXImageMemory * mem, gssize offset, gsize size)
mem->parent.offset + offset, size);
sub->sink = mem->sink;
sub->ximage = mem->ximage;
+#ifdef HAVE_XSHM
sub->SHMInfo = mem->SHMInfo;
+#endif
sub->x = mem->x;
sub->y = mem->y;
sub->width = mem->width;