RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

x11grab: Rename internal component to "xcbgrab"

This commit is contained in:
Diego Biurrun 2016-07-27 11:31:49 +02:00
parent 4fef648d10
commit 5ed4644d6d
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -2367,7 +2367,7 @@ sndio_outdev_deps="sndio_h"
v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines" vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"
vfwcap_indev_extralibs="-lavicap32" vfwcap_indev_extralibs="-lavicap32"
x11grab_xcb_indev_deps="libxcb" xcbgrab_indev_deps="libxcb"
# protocols # protocols
ffrtmpcrypt_protocol_deps="!librtmp_protocol" ffrtmpcrypt_protocol_deps="!librtmp_protocol"

2
libavdevice/Makefile
View File

@ -23,7 +23,7 @@ OBJS-$(CONFIG_SNDIO_INDEV) += sndio_dec.o sndio.o
OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_enc.o sndio.o OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_enc.o sndio.o
OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o
OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o
OBJS-$(CONFIG_X11GRAB_XCB_INDEV) += xcbgrab.o OBJS-$(CONFIG_XCBGRAB_INDEV) += xcbgrab.o
# external libraries # external libraries
OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o

2
libavdevice/alldevices.c
View File

@ -58,7 +58,7 @@ void avdevice_register_all(void)
REGISTER_INOUTDEV(SNDIO, sndio); REGISTER_INOUTDEV(SNDIO, sndio);
REGISTER_INDEV (V4L2, v4l2); REGISTER_INDEV (V4L2, v4l2);
REGISTER_INDEV (VFWCAP, vfwcap); REGISTER_INDEV (VFWCAP, vfwcap);
REGISTER_INDEV (X11GRAB_XCB, x11grab_xcb); REGISTER_INDEV (XCBGRAB, xcbgrab);
/* external libraries */ /* external libraries */
REGISTER_INDEV (LIBCDIO, libcdio); REGISTER_INDEV (LIBCDIO, libcdio);

2
libavdevice/avdevice.h
View File

@ -36,7 +36,7 @@
* (de)muxers in libavdevice are of the AVFMT_NOFILE type (they use their own * (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 * 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 * 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 * To use libavdevice, simply call avdevice_register_all() to register all
* compiled muxers and demuxers. They all use standard libavformat API. * compiled muxers and demuxers. They all use standard libavformat API.

2
libavdevice/xcbgrab.c
View File

@ -684,7 +684,7 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
return 0; return 0;
} }
AVInputFormat ff_x11grab_xcb_demuxer = { AVInputFormat ff_xcbgrab_demuxer = {
.name = "x11grab", .name = "x11grab",
.long_name = NULL_IF_CONFIG_SMALL("X11 screen capture, using XCB"), .long_name = NULL_IF_CONFIG_SMALL("X11 screen capture, using XCB"),
.priv_data_size = sizeof(XCBGrabContext), .priv_data_size = sizeof(XCBGrabContext),