Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
0f79e202
Commit
0f79e202
authored
Apr 17, 2008
by
Richard Hosking
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
i_fd is not applicable for Alsa so don't try and close it if one of the Alsa routines fail.
parent
4dbeeda8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
7 deletions
+3
-7
modules/access/v4l2/v4l2.c
modules/access/v4l2/v4l2.c
+3
-7
No files found.
modules/access/v4l2/v4l2.c
View file @
0f79e202
...
...
@@ -2259,7 +2259,6 @@ static int OpenAudioDevAlsa( vlc_object_t *p_this, demux_sys_t *p_sys,
bool
b_demux
)
{
char
*
psz_device
=
p_sys
->
psz_adev
;
int
i_fd
=
0
;
p_sys
->
p_alsa_pcm
=
NULL
;
char
*
psz_alsa_device_name
=
NULL
;
snd_pcm_hw_params_t
*
p_hw_params
=
NULL
;
...
...
@@ -2426,18 +2425,15 @@ static int OpenAudioDevAlsa( vlc_object_t *p_this, demux_sys_t *p_sys,
goto
adev_fail
;
}
/* Return a fake handle so other tests work */
i_fd
=
1
;
free
(
psz_alsa_device_name
);
if
(
!
p_sys
->
psz_adev
)
p_sys
->
psz_adev
=
strdup
(
ALSA_DEFAULT
);
return
i_fd
;
adev_fail:
/* Return a fake handle so other tests work */
return
1
;
if
(
i_fd
>=
0
)
close
(
i_fd
);
adev_fail:
if
(
p_hw_params
)
snd_pcm_hw_params_free
(
p_hw_params
);
if
(
p_sys
->
p_alsa_pcm
)
snd_pcm_close
(
p_sys
->
p_alsa_pcm
);
...
...
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