generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2014-10-27 21:26:51 +01:00
parent a050cf0c45 a6674d2e77
commit a38a1d516f
6 changed files with 691 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavdevice/alldevices.c
View File

@@ -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 */