Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
3c835b43
Commit
3c835b43
authored
Jan 26, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v4l2: fail on unknowm/unitialized format (fixes #8086)
This bug is already fixed differently in the main line.
parent
ecd6e2e9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
modules/access/v4l2/video.c
modules/access/v4l2/video.c
+11
-1
No files found.
modules/access/v4l2/video.c
View file @
3c835b43
...
@@ -1265,7 +1265,12 @@ static int InitVideo( vlc_object_t *p_obj, int i_fd, demux_sys_t *p_sys,
...
@@ -1265,7 +1265,12 @@ static int InitVideo( vlc_object_t *p_obj, int i_fd, demux_sys_t *p_sys,
width
=
fmt
.
fmt
.
pix
.
width
;
width
=
fmt
.
fmt
.
pix
.
width
;
height
=
fmt
.
fmt
.
pix
.
height
;
height
=
fmt
.
fmt
.
pix
.
height
;
if
(
v4l2_ioctl
(
i_fd
,
VIDIOC_G_FMT
,
&
fmt
)
<
0
)
{;}
if
(
v4l2_ioctl
(
i_fd
,
VIDIOC_G_FMT
,
&
fmt
)
<
0
)
{
msg_Err
(
p_obj
,
"Could not get selected video format: %m"
);
goto
error
;
}
/* Print extra info */
/* Print extra info */
msg_Dbg
(
p_obj
,
"Driver requires at most %d bytes to store a complete image"
,
fmt
.
fmt
.
pix
.
sizeimage
);
msg_Dbg
(
p_obj
,
"Driver requires at most %d bytes to store a complete image"
,
fmt
.
fmt
.
pix
.
sizeimage
);
/* Check interlacing */
/* Check interlacing */
...
@@ -1325,6 +1330,11 @@ static int InitVideo( vlc_object_t *p_obj, int i_fd, demux_sys_t *p_sys,
...
@@ -1325,6 +1330,11 @@ static int InitVideo( vlc_object_t *p_obj, int i_fd, demux_sys_t *p_sys,
break
;
break
;
}
}
}
}
if
(
!
p_sys
->
i_fourcc
)
{
msg_Err
(
p_obj
,
"Could not match pixel format"
);
goto
error
;
}
/* Buggy driver paranoia */
/* Buggy driver paranoia */
i_min
=
fmt
.
fmt
.
pix
.
width
*
2
;
i_min
=
fmt
.
fmt
.
pix
.
width
*
2
;
...
...
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