diff options
author | Clément Bœsch <u@pkh.me> | 2017-03-15 22:17:29 +0100 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-03-15 22:19:56 +0100 |
commit | f6d61eb6f95aaf3a529397f205dd61d5dc47bce0 (patch) | |
tree | 72fcaac4e010ca7f15471c5ca5a4347da426c4d4 /libavdevice/alldevices.c | |
parent | 4a9c5f6bc5a825f10b77f6ce084aa840d5c1d93e (diff) | |
parent | 5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688 (diff) | |
download | ffmpeg-f6d61eb6f95aaf3a529397f205dd61d5dc47bce0.tar.gz |
Merge commit '5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688'
* commit '5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688':
x11grab: Rename internal component to "xcbgrab"
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavdevice/alldevices.c')
-rw-r--r-- | libavdevice/alldevices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index f8f31edea7..280a260bd3 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -63,7 +63,7 @@ static void register_all(void) REGISTER_INOUTDEV(V4L2, v4l2); // REGISTER_INDEV (V4L, v4l REGISTER_INDEV (VFWCAP, vfwcap); - REGISTER_INDEV (X11GRAB_XCB, x11grab_xcb); + REGISTER_INDEV (XCBGRAB, xcbgrab); REGISTER_OUTDEV (XV, xv); /* external libraries */ |