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 | |
| 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>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavdevice/Makefile | 2 | ||||
| -rw-r--r-- | libavdevice/alldevices.c | 2 | ||||
| -rw-r--r-- | libavdevice/avdevice.h | 2 | ||||
| -rw-r--r-- | libavdevice/xcbgrab.c | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -3031,7 +3031,7 @@ v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" v4l2_outdev_deps_any="linux_videodev2_h sys_videoio_h" vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines" vfwcap_indev_extralibs="-lavicap32" -x11grab_xcb_indev_deps="libxcb" +xcbgrab_indev_deps="libxcb" xv_outdev_deps="X11_extensions_Xvlib_h XvGetPortAttribute" xv_outdev_extralibs="-lXv -lX11 -lXext" diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 90ebc95686..78c42e6564 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -47,7 +47,7 @@ OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o v4l2-common.o timefilter.o OBJS-$(CONFIG_V4L2_OUTDEV) += v4l2enc.o v4l2-common.o OBJS-$(CONFIG_V4L_INDEV) += v4l.o OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o -OBJS-$(CONFIG_X11GRAB_XCB_INDEV) += xcbgrab.o +OBJS-$(CONFIG_XCBGRAB_INDEV) += xcbgrab.o OBJS-$(CONFIG_XV_OUTDEV) += xv.o # external libraries 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 */ diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 4315768baa..ee9462480e 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -37,7 +37,7 @@ * (de)muxers in libavdevice are of the AVFMT_NOFILE type (they use their own * I/O functions). The filename passed to avformat_open_input() often does not * refer to an actually existing file, but has some special device-specific - * meaning - e.g. for x11grab_xcb it is the display name. + * meaning - e.g. for xcbgrab it is the display name. * * To use libavdevice, simply call avdevice_register_all() to register all * compiled muxers and demuxers. They all use standard libavformat API. diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index 702e66c71f..2068cd3ab4 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -690,7 +690,7 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s) return 0; } -AVInputFormat ff_x11grab_xcb_demuxer = { +AVInputFormat ff_xcbgrab_demuxer = { .name = "x11grab", .long_name = NULL_IF_CONFIG_SMALL("X11 screen capture, using XCB"), .priv_data_size = sizeof(XCBGrabContext), |