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
b694b642
Commit
b694b642
authored
Apr 02, 2009
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Oops. b_demux should be flase
parent
2ebc21a4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
modules/access/v4l2.c
modules/access/v4l2.c
+5
-4
No files found.
modules/access/v4l2.c
View file @
b694b642
...
@@ -1068,7 +1068,7 @@ static int AccessOpen( vlc_object_t * p_this )
...
@@ -1068,7 +1068,7 @@ static int AccessOpen( vlc_object_t * p_this )
{
{
msg_Dbg
(
p_this
,
"Trying direct kernel v4l2"
);
msg_Dbg
(
p_this
,
"Trying direct kernel v4l2"
);
use_kernel_v4l2
(
p_sys
);
use_kernel_v4l2
(
p_sys
);
if
(
FindMainDevice
(
p_this
,
p_sys
,
tru
e
)
==
VLC_SUCCESS
)
if
(
FindMainDevice
(
p_this
,
p_sys
,
fals
e
)
==
VLC_SUCCESS
)
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
@@ -1854,6 +1854,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
...
@@ -1854,6 +1854,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
ControlList
(
p_obj
,
p_sys
,
i_fd
,
ControlList
(
p_obj
,
p_sys
,
i_fd
,
var_GetBool
(
p_obj
,
"v4l2-controls-reset"
),
b_demux
);
var_GetBool
(
p_obj
,
"v4l2-controls-reset"
),
b_demux
);
SetAvailControlsByString
(
p_obj
,
p_sys
,
i_fd
);
SetAvailControlsByString
(
p_obj
,
p_sys
,
i_fd
);
if
(
false
==
b_demux
)
if
(
false
==
b_demux
)
{
{
return
i_fd
;
return
i_fd
;
...
@@ -1867,7 +1868,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
...
@@ -1867,7 +1868,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
case
IO_METHOD_READ
:
case
IO_METHOD_READ
:
if
(
!
(
p_sys
->
dev_cap
.
capabilities
&
V4L2_CAP_READWRITE
)
)
if
(
!
(
p_sys
->
dev_cap
.
capabilities
&
V4L2_CAP_READWRITE
)
)
{
{
msg_Err
(
p_
demux
,
"device does not support read i/o"
);
msg_Err
(
p_
obj
,
"device does not support read i/o"
);
goto
open_failed
;
goto
open_failed
;
}
}
break
;
break
;
...
@@ -1876,13 +1877,13 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
...
@@ -1876,13 +1877,13 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
case
IO_METHOD_USERPTR
:
case
IO_METHOD_USERPTR
:
if
(
!
(
p_sys
->
dev_cap
.
capabilities
&
V4L2_CAP_STREAMING
)
)
if
(
!
(
p_sys
->
dev_cap
.
capabilities
&
V4L2_CAP_STREAMING
)
)
{
{
msg_Err
(
p_
demux
,
"device does not support streaming i/o"
);
msg_Err
(
p_
obj
,
"device does not support streaming i/o"
);
goto
open_failed
;
goto
open_failed
;
}
}
break
;
break
;
default:
default:
msg_Err
(
p_
demux
,
"io method not supported"
);
msg_Err
(
p_
obj
,
"io method not supported"
);
goto
open_failed
;
goto
open_failed
;
}
}
...
...
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