Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
61d38c8e
Commit
61d38c8e
authored
Apr 11, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v4l2: fix race condition
(regression from
855f0b7d
)
parent
d082caf8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
modules/access/v4l2/access.c
modules/access/v4l2/access.c
+1
-1
modules/access/v4l2/demux.c
modules/access/v4l2/demux.c
+1
-1
No files found.
modules/access/v4l2/access.c
View file @
61d38c8e
...
...
@@ -90,6 +90,7 @@ int AccessOpen( vlc_object_t *obj )
/* fallback to direct kernel mode anyway */
fd
=
rawfd
;
}
sys
->
fd
=
fd
;
if
(
InitVideo
(
access
,
fd
))
{
...
...
@@ -97,7 +98,6 @@ int AccessOpen( vlc_object_t *obj )
goto
error
;
}
sys
->
fd
=
fd
;
access
->
pf_seek
=
NULL
;
access
->
pf_control
=
AccessControl
;
return
VLC_SUCCESS
;
...
...
modules/access/v4l2/demux.c
View file @
61d38c8e
...
...
@@ -95,6 +95,7 @@ int DemuxOpen( vlc_object_t *obj )
/* fallback to direct kernel mode anyway */
fd
=
rawfd
;
}
sys
->
fd
=
fd
;
if
(
InitVideo
(
demux
,
fd
))
{
...
...
@@ -102,7 +103,6 @@ int DemuxOpen( vlc_object_t *obj )
goto
error
;
}
sys
->
fd
=
fd
;
sys
->
controls
=
ControlsInit
(
VLC_OBJECT
(
demux
),
fd
);
demux
->
pf_demux
=
NULL
;
demux
->
pf_control
=
DemuxControl
;
...
...
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