Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
d4a0c69d
Commit
d4a0c69d
authored
Jun 30, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
amem: fix conditionally unitialized cleanup callback
parent
9b904a74
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
modules/audio_output/amem.c
modules/audio_output/amem.c
+3
-2
No files found.
modules/audio_output/amem.c
View file @
d4a0c69d
...
@@ -56,12 +56,12 @@ struct aout_sys_t
...
@@ -56,12 +56,12 @@ struct aout_sys_t
{
{
void
*
opaque
;
void
*
opaque
;
int
(
*
setup
)
(
void
**
,
char
*
,
unsigned
*
,
unsigned
*
);
int
(
*
setup
)
(
void
**
,
char
*
,
unsigned
*
,
unsigned
*
);
void
(
*
cleanup
)
(
void
*
opaque
);
union
union
{
{
struct
struct
{
{
void
*
setup_opaque
;
void
*
setup_opaque
;
void
(
*
cleanup
)
(
void
*
opaque
);
};
};
struct
struct
{
{
...
@@ -243,11 +243,12 @@ static int Open (vlc_object_t *obj)
...
@@ -243,11 +243,12 @@ static int Open (vlc_object_t *obj)
sys
->
setup
=
var_InheritAddress
(
obj
,
"amem-setup"
);
sys
->
setup
=
var_InheritAddress
(
obj
,
"amem-setup"
);
if
(
sys
->
setup
!=
NULL
)
if
(
sys
->
setup
!=
NULL
)
{
{
sys
->
setup_opaque
=
opaque
;
sys
->
cleanup
=
var_InheritAddress
(
obj
,
"amem-cleanup"
);
sys
->
cleanup
=
var_InheritAddress
(
obj
,
"amem-cleanup"
);
sys
->
setup_opaque
=
opaque
;
}
}
else
else
{
{
sys
->
cleanup
=
NULL
;
sys
->
opaque
=
opaque
;
sys
->
opaque
=
opaque
;
sys
->
rate
=
var_InheritInteger
(
obj
,
"amem-rate"
);
sys
->
rate
=
var_InheritInteger
(
obj
,
"amem-rate"
);
sys
->
channels
=
var_InheritInteger
(
obj
,
"amem-channels"
);
sys
->
channels
=
var_InheritInteger
(
obj
,
"amem-channels"
);
...
...
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