har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avdevice/xcbgrab: fix undefined reference to xcb_shape_rectangles in xcbgrab.c

Browse Source 
works with (--enable-libxcb-shape)  and without (--disable-libxcb-shape) now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Boris Reisig 2014-11-24 02:00:05 -06:00 committed by Michael Niedermayer
parent 1d242f9816
commit 54170a33c2
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -254,6 +254,7 @@ External library support:
--enable-libxcb enable X11 grabbing using XCB [auto] --enable-libxcb enable X11 grabbing using XCB [auto]
--enable-libxcb-shm enable X11 grabbing shm communication [auto] --enable-libxcb-shm enable X11 grabbing shm communication [auto]
--enable-libxcb-xfixes enable X11 grabbing mouse rendering [auto] --enable-libxcb-xfixes enable X11 grabbing mouse rendering [auto]
--enable-libxcb-shape enable X11 grabbing shape rendering [auto]
--enable-libxvid enable Xvid encoding via xvidcore, --enable-libxvid enable Xvid encoding via xvidcore,
native MPEG-4/Xvid encoder exists [no] native MPEG-4/Xvid encoder exists [no]
--enable-libzmq enable message passing via libzmq [no] --enable-libzmq enable message passing via libzmq [no]
@ -1386,6 +1387,7 @@ EXTERNAL_LIBRARY_LIST="
libxavs libxavs
libxcb libxcb
libxcb_shm libxcb_shm
libxcb_shape
libxcb_xfixes libxcb_xfixes
libxvid libxvid
libzmq libzmq
@ -5047,8 +5049,13 @@ if enabled libxcb; then
enabled libxcb_xfixes && die "ERROR: libxcb_xfixes not found"; enabled libxcb_xfixes && die "ERROR: libxcb_xfixes not found";
} && enable libxcb_xfixes; } } && enable libxcb_xfixes; }
add_cflags $xcb_cflags $xcb_shm_cflags $xcb_xfixes_cflags disabled libxcb_shape || {
add_extralibs $xcb_libs $xcb_shm_libs $xcb_xfixes_libs check_pkg_config xcb-shape xcb/shape.h xcb_shape_get_rectangles || {
enabled libxcb_shape && die "ERROR: libxcb_shape not found";
} && enable libxcb_shape; }
add_cflags $xcb_cflags $xcb_shm_cflags $xcb_xfixes_cflags $xcb_shape_cflags
add_extralibs $xcb_libs $xcb_shm_libs $xcb_xfixes_libs $xcb_shape_libs
fi fi
fi fi

6
libavdevice/xcbgrab.c
View File

@ -33,6 +33,10 @@
#include <xcb/shm.h> #include <xcb/shm.h>
#endif #endif
#if CONFIG_LIBXCB_SHAPE
#include <xcb/shape.h>
#endif
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libavformat/internal.h" #include "libavformat/internal.h"
@ -576,7 +580,7 @@ static void setup_window(AVFormatContext *s)
XCB_COPY_FROM_PARENT, XCB_COPY_FROM_PARENT,
mask, values); mask, values);
#if XCB_SHAPE_RECTANGLES #if CONFIG_LIBXCB_SHAPE
xcb_shape_rectangles(c->conn, XCB_SHAPE_SO_SUBTRACT, xcb_shape_rectangles(c->conn, XCB_SHAPE_SO_SUBTRACT,
XCB_SHAPE_SK_BOUNDING, XCB_CLIP_ORDERING_UNSORTED, XCB_SHAPE_SK_BOUNDING, XCB_CLIP_ORDERING_UNSORTED,
c->window, c->window,