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
547315ab
Commit
547315ab
authored
Apr 25, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout: fix leaks in ThreadStart()
parent
7be6cf31
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
4 deletions
+17
-4
src/video_output/video_output.c
src/video_output/video_output.c
+17
-4
No files found.
src/video_output/video_output.c
View file @
547315ab
...
@@ -1324,9 +1324,9 @@ static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state)
...
@@ -1324,9 +1324,9 @@ static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state)
}
}
if
(
vout_OpenWrapper
(
vout
,
vout
->
p
->
splitter_name
,
state
))
if
(
vout_OpenWrapper
(
vout
,
vout
->
p
->
splitter_name
,
state
))
return
VLC_EGENERIC
;
goto
error
;
if
(
vout_InitWrapper
(
vout
))
if
(
vout_InitWrapper
(
vout
))
return
VLC_EGENERIC
;
goto
error
;
assert
(
vout
->
p
->
decoder_pool
);
assert
(
vout
->
p
->
decoder_pool
);
vout
->
p
->
displayed
.
current
=
NULL
;
vout
->
p
->
displayed
.
current
=
NULL
;
...
@@ -1344,6 +1344,15 @@ static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state)
...
@@ -1344,6 +1344,15 @@ static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state)
video_format_Print
(
VLC_OBJECT
(
vout
),
"original format"
,
&
vout
->
p
->
original
);
video_format_Print
(
VLC_OBJECT
(
vout
),
"original format"
,
&
vout
->
p
->
original
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
error:
if
(
vout
->
p
->
filter
.
chain_interactive
!=
NULL
)
filter_chain_Delete
(
vout
->
p
->
filter
.
chain_interactive
);
if
(
vout
->
p
->
filter
.
chain_static
!=
NULL
)
filter_chain_Delete
(
vout
->
p
->
filter
.
chain_static
);
video_format_Clean
(
&
vout
->
p
->
filter
.
format
);
if
(
vout
->
p
->
decoder_fifo
!=
NULL
)
picture_fifo_Delete
(
vout
->
p
->
decoder_fifo
);
return
VLC_EGENERIC
;
}
}
static
void
ThreadStop
(
vout_thread_t
*
vout
,
vout_display_state_t
*
state
)
static
void
ThreadStop
(
vout_thread_t
*
vout
,
vout_display_state_t
*
state
)
...
@@ -1444,8 +1453,12 @@ static int ThreadControl(vout_thread_t *vout, vout_control_cmd_t cmd)
...
@@ -1444,8 +1453,12 @@ static int ThreadControl(vout_thread_t *vout, vout_control_cmd_t cmd)
switch
(
cmd
.
type
)
{
switch
(
cmd
.
type
)
{
case
VOUT_CONTROL_INIT
:
case
VOUT_CONTROL_INIT
:
ThreadInit
(
vout
);
ThreadInit
(
vout
);
if
(
!
ThreadStart
(
vout
,
NULL
))
if
(
ThreadStart
(
vout
,
NULL
))
break
;
{
ThreadClean
(
vout
);
return
1
;
}
break
;
case
VOUT_CONTROL_CLEAN
:
case
VOUT_CONTROL_CLEAN
:
ThreadStop
(
vout
,
NULL
);
ThreadStop
(
vout
,
NULL
);
ThreadClean
(
vout
);
ThreadClean
(
vout
);
...
...
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