---
configure | 2 +-
libavdevice/Makefile | 2 +-
libavdevice/alldevices.c | 2 +-
libavdevice/x11grab.c | 25 ++++++++++++-------------
4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/configure b/configure
index 7334a52..fb26b64 100755
--- a/configure
+++ b/configure
@@ -1524,7 +1524,7 @@ sndio_outdev_deps="sndio_h"
v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"
vfwcap_indev_extralibs="-lavicap32"
-x11_grab_device_indev_deps="XShmCreateImage gpl"
+x11grab_device_indev_deps="XShmCreateImage gpl"
# protocols
ffrtmphttp_protocol_deps="!librtmp_protocol"
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 7f14217..1dcc2bf 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -23,7 +23,7 @@ OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o
sndio_dec.o
OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o
OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o
OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o
-OBJS-$(CONFIG_X11_GRAB_DEVICE_INDEV) += x11grab.o
+OBJS-$(CONFIG_X11GRAB_DEVICE_INDEV) += x11grab.o
# external libraries
OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index f1ff790..323197f 100644
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -49,7 +49,7 @@ void avdevice_register_all(void)
REGISTER_INOUTDEV (SNDIO, sndio);
REGISTER_INDEV (V4L2, v4l2);
REGISTER_INDEV (VFWCAP, vfwcap);
- REGISTER_INDEV (X11_GRAB_DEVICE, x11_grab_device);
+ REGISTER_INDEV (X11GRAB_DEVICE, x11grab_device);
/* external libraries */
REGISTER_INDEV (LIBCDIO, libcdio);
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 06cec9d..8da5bd3 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -56,8 +56,7 @@
/**
* X11 Device Demuxer context
*/
-struct x11_grab
-{
+struct x11grab {
const AVClass *class; /**< Class for private options. */
int frame_size; /**< Size in bytes of a grabbed frame */
AVRational time_base; /**< Time base */
@@ -85,10 +84,10 @@ struct x11_grab
/**
* Draw grabbing region window
*
- * @param s x11_grab context
+ * @param s x11grab context
*/
static void
-x11grab_draw_region_win(struct x11_grab *s)
+x11grab_draw_region_win(struct x11grab *s)
{
Display *dpy = s->dpy;
int screen;
@@ -110,10 +109,10 @@ x11grab_draw_region_win(struct x11_grab *s)
/**
* Initialize grabbing region window
*
- * @param s x11_grab context
+ * @param s x11grab context
*/
static void
-x11grab_region_win_init(struct x11_grab *s)
+x11grab_region_win_init(struct x11grab *s)
{
Display *dpy = s->dpy;
int screen;
@@ -155,7 +154,7 @@ x11grab_region_win_init(struct x11_grab *s)
static int
x11grab_read_header(AVFormatContext *s1)
{
- struct x11_grab *x11grab = s1->priv_data;
+ struct x11grab *x11grab = s1->priv_data;
Display *dpy;
AVStream *st = NULL;
enum PixelFormat input_pixfmt;
@@ -334,7 +333,7 @@ out:
* coordinates
*/
static void
-paint_mouse_pointer(XImage *image, struct x11_grab *s)
+paint_mouse_pointer(XImage *image, struct x11grab *s)
{
int x_off = s->x_off;
int y_off = s->y_off;
@@ -448,7 +447,7 @@ xget_zpixmap(Display *dpy, Drawable d, XImage *image, int
x, int y)
static int
x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
{
- struct x11_grab *s = s1->priv_data;
+ struct x11grab *s = s1->priv_data;
Display *dpy = s->dpy;
XImage *image = s->image;
int x_off = s->x_off;
@@ -558,7 +557,7 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
static int
x11grab_read_close(AVFormatContext *s1)
{
- struct x11_grab *x11grab = s1->priv_data;
+ struct x11grab *x11grab = s1->priv_data;
/* Detach cleanly from shared mem */
if (x11grab->use_shm) {
@@ -582,7 +581,7 @@ x11grab_read_close(AVFormatContext *s1)
return 0;
}
-#define OFFSET(x) offsetof(struct x11_grab, x)
+#define OFFSET(x) offsetof(struct x11grab, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM
static const AVOption options[] = {
{ "video_size", "A string describing frame size, such as 640x480 or
hd720.", OFFSET(video_size), AV_OPT_TYPE_STRING, {.str = "vga"}, 0, 0, DEC },
@@ -603,10 +602,10 @@ static const AVClass x11_class = {
};
/** x11 grabber device demuxer declaration */
-AVInputFormat ff_x11_grab_device_demuxer = {
+AVInputFormat ff_x11grab_device_demuxer = {
.name = "x11grab",
.long_name = NULL_IF_CONFIG_SMALL("X11grab"),
- .priv_data_size = sizeof(struct x11_grab),
+ .priv_data_size = sizeof(struct x11grab),
.read_header = x11grab_read_header,
.read_packet = x11grab_read_packet,
.read_close = x11grab_read_close,
--
1.7.2.5
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
