Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
aaea1490
Commit
aaea1490
authored
May 26, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavdevice: mark v4l for removal on next major bump.
parent
93681fbd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
0 deletions
+11
-0
alldevices.c
libavdevice/alldevices.c
+2
-0
avdevice.h
libavdevice/avdevice.h
+4
-0
v4l.c
libavdevice/v4l.c
+5
-0
No files found.
libavdevice/alldevices.c
View file @
aaea1490
...
@@ -47,7 +47,9 @@ void avdevice_register_all(void)
...
@@ -47,7 +47,9 @@ void avdevice_register_all(void)
REGISTER_INOUTDEV
(
OSS
,
oss
);
REGISTER_INOUTDEV
(
OSS
,
oss
);
REGISTER_INOUTDEV
(
SNDIO
,
sndio
);
REGISTER_INOUTDEV
(
SNDIO
,
sndio
);
REGISTER_INDEV
(
V4L2
,
v4l2
);
REGISTER_INDEV
(
V4L2
,
v4l2
);
#if FF_API_V4L
REGISTER_INDEV
(
V4L
,
v4l
);
REGISTER_INDEV
(
V4L
,
v4l
);
#endif
REGISTER_INDEV
(
VFWCAP
,
vfwcap
);
REGISTER_INDEV
(
VFWCAP
,
vfwcap
);
REGISTER_INDEV
(
X11_GRAB_DEVICE
,
x11_grab_device
);
REGISTER_INDEV
(
X11_GRAB_DEVICE
,
x11_grab_device
);
...
...
libavdevice/avdevice.h
View file @
aaea1490
...
@@ -33,6 +33,10 @@
...
@@ -33,6 +33,10 @@
LIBAVDEVICE_VERSION_MICRO)
LIBAVDEVICE_VERSION_MICRO)
#define LIBAVDEVICE_BUILD LIBAVDEVICE_VERSION_INT
#define LIBAVDEVICE_BUILD LIBAVDEVICE_VERSION_INT
#ifndef FF_API_V4L
#define FF_API_V4L (LIBAVDEVICE_VERSION_MAJOR < 54)
#endif
/**
/**
* Return the LIBAVDEVICE_VERSION_INT constant.
* Return the LIBAVDEVICE_VERSION_INT constant.
*/
*/
...
...
libavdevice/v4l.c
View file @
aaea1490
...
@@ -19,6 +19,8 @@
...
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
#if FF_API_V4L
#undef __STRICT_ANSI__ //workaround due to broken kernel headers
#undef __STRICT_ANSI__ //workaround due to broken kernel headers
#include "config.h"
#include "config.h"
#include "libavutil/rational.h"
#include "libavutil/rational.h"
...
@@ -83,6 +85,8 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
...
@@ -83,6 +85,8 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
int
j
;
int
j
;
int
vformat_num
=
FF_ARRAY_ELEMS
(
video_formats
);
int
vformat_num
=
FF_ARRAY_ELEMS
(
video_formats
);
av_log
(
s1
,
AV_LOG_WARNING
,
"V4L input device is deprecated and will be removed in the next release."
);
if
(
ap
->
time_base
.
den
<=
0
)
{
if
(
ap
->
time_base
.
den
<=
0
)
{
av_log
(
s1
,
AV_LOG_ERROR
,
"Wrong time base (%d)
\n
"
,
ap
->
time_base
.
den
);
av_log
(
s1
,
AV_LOG_ERROR
,
"Wrong time base (%d)
\n
"
,
ap
->
time_base
.
den
);
return
-
1
;
return
-
1
;
...
@@ -368,3 +372,4 @@ AVInputFormat ff_v4l_demuxer = {
...
@@ -368,3 +372,4 @@ AVInputFormat ff_v4l_demuxer = {
.
flags
=
AVFMT_NOFILE
,
.
flags
=
AVFMT_NOFILE
,
.
priv_class
=
&
v4l_class
,
.
priv_class
=
&
v4l_class
,
};
};
#endif
/* FF_API_V4L */
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