[FFmpeg-cvslog] Fix compilation of xcbgrab if xcb/shape.h is not available.

Carl Eugen Hoyos git at videolan.org
Thu Oct 30 10:27:03 CET 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Oct 30 10:22:34 2014 +0100| [792f0f20456cc24f1f1b9ee445e50737d65e38df] | committer: Carl Eugen Hoyos

Fix compilation of xcbgrab if xcb/shape.h is not available.

Old versions of libxcb do not provide xcb_shape_rectangles().
The issue can be fixed differently but this small change fixes
some fate platforms and a user reported compilation problem.

Reported and tested by trac user kevmitch.
Fixes ticket #4067.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=792f0f20456cc24f1f1b9ee445e50737d65e38df
---

 libavdevice/xcbgrab.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c
index c378002..b162763 100644
--- a/libavdevice/xcbgrab.c
+++ b/libavdevice/xcbgrab.c
@@ -580,11 +580,13 @@ static void setup_window(AVFormatContext *s)
                       XCB_COPY_FROM_PARENT,
                       mask, values);
 
+#if XCB_SHAPE_RECTANGLES
     xcb_shape_rectangles(c->conn, XCB_SHAPE_SO_SUBTRACT,
                          XCB_SHAPE_SK_BOUNDING, XCB_CLIP_ORDERING_UNSORTED,
                          c->window,
                          c->region_border, c->region_border,
                          1, &rect);
+#endif
 
     xcb_map_window(c->conn, c->window);
 



More information about the ffmpeg-cvslog mailing list