Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
450
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
c68d89c4
Commit
c68d89c4
authored
3 years ago
by
Thomas Guillem
Committed by
Hugo Beauzée-Luyssen
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
aout: remove useless intermediate variable
parent
ff81edf3
No related branches found
Branches containing commit
No related tags found
1 merge request
!148
aout: remove useless intermediate variable
Pipeline
#102830
passed with stages
in 41 minutes and 39 seconds
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/audio_output/output.c
+3
-6
3 additions, 6 deletions
src/audio_output/output.c
with
3 additions
and
6 deletions
src/audio_output/output.c
+
3
−
6
View file @
c68d89c4
...
...
@@ -420,8 +420,7 @@ void aout_Release(audio_output_t *aout)
}
static
int
aout_PrepareStereoMode
(
audio_output_t
*
aout
,
const
audio_sample_format_t
*
restrict
fmt
,
unsigned
i_nb_input_channels
)
const
audio_sample_format_t
*
restrict
fmt
)
{
aout_owner_t
*
owner
=
aout_owner
(
aout
);
...
...
@@ -430,7 +429,7 @@ static int aout_PrepareStereoMode(audio_output_t *aout,
const
char
*
txt
;
val
.
i_int
=
0
;
if
(
!
AOUT_FMT_LINEAR
(
fmt
)
||
i_nb_input
_channels
!=
2
)
if
(
!
AOUT_FMT_LINEAR
(
fmt
)
||
fmt
->
i
_channels
!=
2
)
return
AOUT_VAR_CHAN_UNSET
;
int
i_default_mode
=
owner
->
requested_stereo_mode
;
...
...
@@ -663,7 +662,6 @@ int aout_OutputNew (audio_output_t *aout)
audio_sample_format_t
*
filter_fmt
=
&
owner
->
filter_format
;
aout_filters_cfg_t
*
filters_cfg
=
&
owner
->
filters_cfg
;
unsigned
i_nb_input_channels
=
fmt
->
i_channels
;
vlc_fourcc_t
formats
[]
=
{
fmt
->
i_format
,
0
,
0
};
...
...
@@ -732,8 +730,7 @@ int aout_OutputNew (audio_output_t *aout)
}
}
int
stereo_mode
=
aout_PrepareStereoMode
(
aout
,
fmt
,
i_nb_input_channels
);
int
stereo_mode
=
aout_PrepareStereoMode
(
aout
,
fmt
);
if
(
stereo_mode
!=
AOUT_VAR_CHAN_UNSET
&&
aout_HasStereoMode
(
aout
,
stereo_mode
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment