diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-27 23:26:51 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-27 23:26:51 +0300 |
commit | a38a1d516fe68542523c772af27e41f28ae9852c (patch) | |
tree | 64cf1ee6d3cec0693a3f837c0d1bfde574f30346 /libavdevice/alldevices.c | |
parent | a050cf0c451bdf1c1bd512c4fce6b6f8a5e85102 (diff) | |
parent | a6674d2e7771dbf7a4a5556f5e126be83cadac96 (diff) |
Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'
* commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96':
xcbgrab: XCB-based screen capture
Conflicts:
Changelog
configure
libavdevice/Makefile
libavdevice/alldevices.c
libavdevice/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alldevices.c')
-rw-r--r-- | libavdevice/alldevices.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index b8e7854f47..26aecf29d9 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -69,6 +69,7 @@ void avdevice_register_all(void) // REGISTER_INDEV (V4L, v4l REGISTER_INDEV (VFWCAP, vfwcap); REGISTER_INDEV (X11GRAB, x11grab); + REGISTER_INDEV (X11GRAB_XCB, x11grab_xcb); REGISTER_OUTDEV (XV, xv); /* external libraries */ |