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
6858023f
Commit
6858023f
authored
Jan 17, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Destroy/cleanup should be consistent with Create/Init
Otherwise, the Create/Destroy sequence crashes.
parent
07fb0fb9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
src/libvlc.c
src/libvlc.c
+12
-12
No files found.
src/libvlc.c
View file @
6858023f
...
@@ -1071,18 +1071,6 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
...
@@ -1071,18 +1071,6 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
msg_Dbg
(
p_libvlc
,
"removing stats"
);
msg_Dbg
(
p_libvlc
,
"removing stats"
);
vlc_mutex_destroy
(
&
p_libvlc
->
p_stats
->
lock
);
vlc_mutex_destroy
(
&
p_libvlc
->
p_stats
->
lock
);
FREENULL
(
p_libvlc
->
p_stats
);
FREENULL
(
p_libvlc
->
p_stats
);
}
/**
* Destroy everything.
* This function requests the running threads to finish, waits for their
* termination, and destroys their structure.
* It stops the thread systems: no instance can run after this has run
* \param p_libvlc the instance to destroy
*/
void
libvlc_InternalDestroy
(
libvlc_int_t
*
p_libvlc
)
{
libvlc_priv_t
*
priv
=
libvlc_priv
(
p_libvlc
);
#ifndef WIN32
#ifndef WIN32
char
*
psz_pidfile
=
NULL
;
char
*
psz_pidfile
=
NULL
;
...
@@ -1116,6 +1104,18 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc )
...
@@ -1116,6 +1104,18 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc )
var_DelCallback
(
p_libvlc
,
"key-pressed"
,
vlc_key_to_action
,
var_DelCallback
(
p_libvlc
,
"key-pressed"
,
vlc_key_to_action
,
p_libvlc
->
p_hotkeys
);
p_libvlc
->
p_hotkeys
);
FREENULL
(
p_libvlc
->
p_hotkeys
);
FREENULL
(
p_libvlc
->
p_hotkeys
);
}
/**
* Destroy everything.
* This function requests the running threads to finish, waits for their
* termination, and destroys their structure.
* It stops the thread systems: no instance can run after this has run
* \param p_libvlc the instance to destroy
*/
void
libvlc_InternalDestroy
(
libvlc_int_t
*
p_libvlc
)
{
libvlc_priv_t
*
priv
=
libvlc_priv
(
p_libvlc
);
vlc_mutex_lock
(
&
global_lock
);
vlc_mutex_lock
(
&
global_lock
);
i_instances
--
;
i_instances
--
;
...
...
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