Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
5ed4644d
Commit
5ed4644d
authored
Jul 27, 2016
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x11grab: Rename internal component to "xcbgrab"
parent
4fef648d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
configure
configure
+1
-1
Makefile
libavdevice/Makefile
+1
-1
alldevices.c
libavdevice/alldevices.c
+1
-1
avdevice.h
libavdevice/avdevice.h
+1
-1
xcbgrab.c
libavdevice/xcbgrab.c
+1
-1
No files found.
configure
View file @
5ed4644d
...
@@ -2367,7 +2367,7 @@ sndio_outdev_deps="sndio_h"
...
@@ -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"
x
11grab_xc
b_indev_deps
=
"libxcb"
x
cbgra
b_indev_deps
=
"libxcb"
# protocols
# protocols
ffrtmpcrypt_protocol_deps
=
"!librtmp_protocol"
ffrtmpcrypt_protocol_deps
=
"!librtmp_protocol"
...
...
libavdevice/Makefile
View file @
5ed4644d
...
@@ -23,7 +23,7 @@ OBJS-$(CONFIG_SNDIO_INDEV) += sndio_dec.o sndio.o
...
@@ -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_X
11GRAB_XCB_INDEV)
+=
xcbgrab.o
OBJS-$(CONFIG_X
CBGRAB_INDEV)
+=
xcbgrab.o
# external libraries
# external libraries
OBJS-$(CONFIG_LIBCDIO_INDEV)
+=
libcdio.o
OBJS-$(CONFIG_LIBCDIO_INDEV)
+=
libcdio.o
...
...
libavdevice/alldevices.c
View file @
5ed4644d
...
@@ -58,7 +58,7 @@ void avdevice_register_all(void)
...
@@ -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
(
X
11GRAB_XCB
,
x11grab_xc
b
);
REGISTER_INDEV
(
X
CBGRAB
,
xcbgra
b
);
/* external libraries */
/* external libraries */
REGISTER_INDEV
(
LIBCDIO
,
libcdio
);
REGISTER_INDEV
(
LIBCDIO
,
libcdio
);
...
...
libavdevice/avdevice.h
View file @
5ed4644d
...
@@ -36,7 +36,7 @@
...
@@ -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 x
11grab_xc
b it is the display name.
* meaning - e.g. for x
cbgra
b 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.
...
...
libavdevice/xcbgrab.c
View file @
5ed4644d
...
@@ -684,7 +684,7 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
...
@@ -684,7 +684,7 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
return
0
;
return
0
;
}
}
AVInputFormat
ff_x
11grab_xc
b_demuxer
=
{
AVInputFormat
ff_x
cbgra
b_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
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment