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
2d48515e
Commit
2d48515e
authored
May 28, 2011
by
Stefano Sabatini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v4l2: perform minor style fixes
parent
7b017086
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
v4l2.c
libavdevice/v4l2.c
+3
-3
No files found.
libavdevice/v4l2.c
View file @
2d48515e
...
...
@@ -350,7 +350,7 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt)
return
AVERROR
(
errno
);
}
assert
(
buf
.
index
<
s
->
buffers
);
assert
(
buf
.
index
<
s
->
buffers
);
if
(
s
->
frame_size
>
0
&&
buf
.
bytesused
!=
s
->
frame_size
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"The v4l2 frame is %d bytes, but %d bytes are expected
\n
"
,
buf
.
bytesused
,
s
->
frame_size
);
return
AVERROR_INVALIDDATA
;
...
...
@@ -435,7 +435,7 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
struct
video_data
*
s
=
s1
->
priv_data
;
struct
v4l2_input
input
=
{
0
};
struct
v4l2_standard
standard
=
{
0
};
struct
v4l2_streamparm
streamparm
=
{
0
};
struct
v4l2_streamparm
streamparm
=
{
0
};
struct
v4l2_fract
*
tpf
=
&
streamparm
.
parm
.
capture
.
timeperframe
;
int
i
;
...
...
@@ -472,7 +472,7 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
av_log
(
s1
,
AV_LOG_DEBUG
,
"The V4L2 driver set standard: %s
\n
"
,
s
->
standard
);
/* set tv standard */
for
(
i
=
0
;;
i
++
)
{
for
(
i
=
0
;;
i
++
)
{
standard
.
index
=
i
;
if
(
ioctl
(
s
->
fd
,
VIDIOC_ENUMSTD
,
&
standard
)
<
0
)
{
av_log
(
s1
,
AV_LOG_ERROR
,
"The V4L2 driver ioctl set standard(%s) failed
\n
"
,
...
...
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