Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
0ff3d0e6
Commit
0ff3d0e6
authored
Jan 16, 2011
by
Srikanth Raju
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ML/Core: Release ML before playlist deactivates
ML holds some PL resources
parent
456b99c4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
11 deletions
+10
-11
src/libvlc.c
src/libvlc.c
+10
-11
No files found.
src/libvlc.c
View file @
0ff3d0e6
...
@@ -973,6 +973,16 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
...
@@ -973,6 +973,16 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
libvlc_priv_t
*
priv
=
libvlc_priv
(
p_libvlc
);
libvlc_priv_t
*
priv
=
libvlc_priv
(
p_libvlc
);
playlist_t
*
p_playlist
=
libvlc_priv
(
p_libvlc
)
->
p_playlist
;
playlist_t
*
p_playlist
=
libvlc_priv
(
p_libvlc
)
->
p_playlist
;
#if defined(MEDIA_LIBRARY)
media_library_t
*
p_ml
=
priv
->
p_ml
;
if
(
p_ml
)
{
ml_Destroy
(
VLC_OBJECT
(
p_ml
)
);
vlc_object_release
(
p_ml
);
libvlc_priv
(
p_playlist
->
p_libvlc
)
->
p_ml
=
NULL
;
}
#endif
/* Deactivate the playlist */
/* Deactivate the playlist */
msg_Dbg
(
p_libvlc
,
"deactivating the playlist"
);
msg_Dbg
(
p_libvlc
,
"deactivating the playlist"
);
pl_Deactivate
(
p_libvlc
);
pl_Deactivate
(
p_libvlc
);
...
@@ -996,17 +1006,6 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
...
@@ -996,17 +1006,6 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
/* Free playlist now, all threads are gone */
/* Free playlist now, all threads are gone */
playlist_Destroy
(
p_playlist
);
playlist_Destroy
(
p_playlist
);
#if defined(MEDIA_LIBRARY)
media_library_t
*
p_ml
=
priv
->
p_ml
;
if
(
p_ml
)
{
ml_Destroy
(
VLC_OBJECT
(
p_ml
)
);
vlc_object_release
(
p_ml
);
libvlc_priv
(
p_playlist
->
p_libvlc
)
->
p_ml
=
NULL
;
}
#endif
stats_TimersDumpAll
(
p_libvlc
);
stats_TimersDumpAll
(
p_libvlc
);
stats_TimersCleanAll
(
p_libvlc
);
stats_TimersCleanAll
(
p_libvlc
);
...
...
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