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
de4e4bfc
Commit
de4e4bfc
authored
Oct 25, 2008
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove warnings.
parent
6409dc01
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
14 deletions
+10
-14
modules/access/v4l2/v4l2.c
modules/access/v4l2/v4l2.c
+10
-14
No files found.
modules/access/v4l2/v4l2.c
View file @
de4e4bfc
...
...
@@ -1685,7 +1685,7 @@ static block_t* GrabAudio( demux_t *p_demux )
/*****************************************************************************
* Helper function to initalise video IO using the Read method
*****************************************************************************/
static
int
InitRead
(
demux_t
*
p_demux
,
int
i_fd
,
unsigned
int
i_buffer_size
)
static
int
InitRead
(
demux_t
*
p_demux
,
unsigned
int
i_buffer_size
)
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
...
...
@@ -2156,7 +2156,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
switch
(
p_sys
->
io
)
{
case
IO_METHOD_READ
:
if
(
InitRead
(
p_demux
,
i_fd
,
fmt
.
fmt
.
pix
.
sizeimage
)
!=
VLC_SUCCESS
)
goto
open_failed
;
if
(
InitRead
(
p_demux
,
fmt
.
fmt
.
pix
.
sizeimage
)
!=
VLC_SUCCESS
)
goto
open_failed
;
break
;
case
IO_METHOD_MMAP
:
...
...
@@ -2274,8 +2274,7 @@ static char *ResolveALSADeviceName( const char *psz_device )
* OpenAudioDev: open and set up the audio device and probe for capabilities
*****************************************************************************/
#ifdef HAVE_ALSA
static
int
OpenAudioDevAlsa
(
vlc_object_t
*
p_this
,
demux_sys_t
*
p_sys
,
bool
b_demux
)
static
int
OpenAudioDevAlsa
(
vlc_object_t
*
p_this
,
demux_sys_t
*
p_sys
)
{
char
*
psz_device
=
p_sys
->
psz_adev
;
p_sys
->
p_alsa_pcm
=
NULL
;
...
...
@@ -2463,8 +2462,7 @@ static int OpenAudioDevAlsa( vlc_object_t *p_this, demux_sys_t *p_sys,
}
#endif
static
int
OpenAudioDevOss
(
vlc_object_t
*
p_this
,
demux_sys_t
*
p_sys
,
bool
b_demux
)
static
int
OpenAudioDevOss
(
vlc_object_t
*
p_this
,
demux_sys_t
*
p_sys
)
{
int
i_fd
=
0
;
int
i_format
;
...
...
@@ -2523,11 +2521,11 @@ static int OpenAudioDev( vlc_object_t *p_this, demux_sys_t *p_sys,
#ifdef HAVE_ALSA
if
(
(
p_sys
->
i_audio_method
&
AUDIO_METHOD_ALSA
)
&&
i_fd
<
0
)
i_fd
=
OpenAudioDevAlsa
(
p_this
,
p_sys
,
b_demux
);
i_fd
=
OpenAudioDevAlsa
(
p_this
,
p_sys
);
#endif
if
(
(
p_sys
->
i_audio_method
&
AUDIO_METHOD_OSS
)
&&
i_fd
<
0
)
i_fd
=
OpenAudioDevOss
(
p_this
,
p_sys
,
b_demux
);
i_fd
=
OpenAudioDevOss
(
p_this
,
p_sys
);
if
(
i_fd
<
0
)
return
i_fd
;
...
...
@@ -2898,8 +2896,7 @@ open_failed:
* ProbeAudioDev: probe audio for capabilities
*****************************************************************************/
#ifdef HAVE_ALSA
static
bool
ProbeAudioDevAlsa
(
vlc_object_t
*
p_this
,
demux_sys_t
*
p_sys
,
char
*
psz_device
)
static
bool
ProbeAudioDevAlsa
(
vlc_object_t
*
p_this
,
char
*
psz_device
)
{
int
i_err
;
snd_pcm_t
*
p_alsa_pcm
;
...
...
@@ -2919,8 +2916,7 @@ static bool ProbeAudioDevAlsa( vlc_object_t *p_this, demux_sys_t *p_sys,
}
#endif
static
bool
ProbeAudioDevOss
(
vlc_object_t
*
p_this
,
demux_sys_t
*
p_sys
,
char
*
psz_device
)
static
bool
ProbeAudioDevOss
(
vlc_object_t
*
p_this
,
char
*
psz_device
)
{
int
i_fd
=
0
;
int
i_caps
;
...
...
@@ -2955,7 +2951,7 @@ static bool ProbeAudioDev( vlc_object_t *p_this, demux_sys_t *p_sys,
{
#ifdef HAVE_ALSA
if
(
(
p_sys
->
i_audio_method
&
AUDIO_METHOD_ALSA
)
&&
ProbeAudioDevAlsa
(
p_this
,
p
_sys
,
p
sz_device
)
)
&&
ProbeAudioDevAlsa
(
p_this
,
psz_device
)
)
{
p_sys
->
i_audio_method
=
AUDIO_METHOD_ALSA
;
return
true
;
...
...
@@ -2963,7 +2959,7 @@ static bool ProbeAudioDev( vlc_object_t *p_this, demux_sys_t *p_sys,
#endif
if
(
(
p_sys
->
i_audio_method
&
AUDIO_METHOD_OSS
)
&&
ProbeAudioDevOss
(
p_this
,
p
_sys
,
p
sz_device
)
)
&&
ProbeAudioDevOss
(
p_this
,
psz_device
)
)
{
p_sys
->
i_audio_method
=
AUDIO_METHOD_OSS
;
return
true
;
...
...
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