diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-27 21:26:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-27 21:26:51 +0100 |
| commit | a38a1d516fe68542523c772af27e41f28ae9852c (patch) | |
| tree | 64cf1ee6d3cec0693a3f837c0d1bfde574f30346 /libavdevice/sndio_common.h | |
| parent | a050cf0c451bdf1c1bd512c4fce6b6f8a5e85102 (diff) | |
| parent | a6674d2e7771dbf7a4a5556f5e126be83cadac96 (diff) | |
| download | ffmpeg-a38a1d516fe68542523c772af27e41f28ae9852c.tar.gz | |
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/sndio_common.h')
0 files changed, 0 insertions, 0 deletions