diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-07-27 11:31:49 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-07-29 19:03:10 +0200 |
| commit | 5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688 (patch) | |
| tree | 5dcfbcee4cfe57cfa7d06a7b28027737b92f5680 /libavdevice | |
| parent | 4fef648d10bf3bcfd4b8fa5755c1128966a2427c (diff) | |
| download | ffmpeg-5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688.tar.gz | |
x11grab: Rename internal component to "xcbgrab"
Diffstat (limited to 'libavdevice')
| -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 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index a4c96efaf1..5bb1d3f8c9 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -23,7 +23,7 @@ OBJS-$(CONFIG_SNDIO_INDEV) += sndio_dec.o sndio.o OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_enc.o sndio.o OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o -OBJS-$(CONFIG_X11GRAB_XCB_INDEV) += xcbgrab.o +OBJS-$(CONFIG_XCBGRAB_INDEV) += xcbgrab.o # external libraries OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 8541dba519..cdbca4c8e8 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -58,7 +58,7 @@ void avdevice_register_all(void) REGISTER_INOUTDEV(SNDIO, sndio); REGISTER_INDEV (V4L2, v4l2); REGISTER_INDEV (VFWCAP, vfwcap); - REGISTER_INDEV (X11GRAB_XCB, x11grab_xcb); + REGISTER_INDEV (XCBGRAB, xcbgrab); /* external libraries */ REGISTER_INDEV (LIBCDIO, libcdio); diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 824ac52659..74043112df 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -36,7 +36,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 9b85c28e24..0fd99ebc9f 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -684,7 +684,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), |