Commit 6465bbf7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

libvlc_InternalDestroy: remove dead code

parent f7bb9fcf
...@@ -164,7 +164,7 @@ void libvlc_release( libvlc_instance_t *p_instance ) ...@@ -164,7 +164,7 @@ void libvlc_release( libvlc_instance_t *p_instance )
vlc_mutex_destroy( lock ); vlc_mutex_destroy( lock );
vlc_mutex_destroy( &p_instance->event_callback_lock ); vlc_mutex_destroy( &p_instance->event_callback_lock );
libvlc_InternalCleanup( p_instance->p_libvlc_int ); libvlc_InternalCleanup( p_instance->p_libvlc_int );
libvlc_InternalDestroy( p_instance->p_libvlc_int, false ); libvlc_InternalDestroy( p_instance->p_libvlc_int );
free( p_instance ); free( p_instance );
} }
} }
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
VLC_EXPORT (libvlc_int_t *, libvlc_InternalCreate, ( void ) ); VLC_EXPORT (libvlc_int_t *, libvlc_InternalCreate, ( void ) );
VLC_EXPORT (int, libvlc_InternalInit, ( libvlc_int_t *, int, const char *ppsz_argv[] ) ); VLC_EXPORT (int, libvlc_InternalInit, ( libvlc_int_t *, int, const char *ppsz_argv[] ) );
VLC_EXPORT (int, libvlc_InternalCleanup, ( libvlc_int_t * ) ); VLC_EXPORT (int, libvlc_InternalCleanup, ( libvlc_int_t * ) );
VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t *, bool ) ); VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t * ) );
VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char * ) ); VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char * ) );
......
...@@ -1023,9 +1023,8 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) ...@@ -1023,9 +1023,8 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
* termination, and destroys their structure. * termination, and destroys their structure.
* It stops the thread systems: no instance can run after this has run * It stops the thread systems: no instance can run after this has run
* \param p_libvlc the instance to destroy * \param p_libvlc the instance to destroy
* \param b_release whether we should do a release on the instance
*/ */
int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release ) int libvlc_InternalDestroy( libvlc_int_t *p_libvlc )
{ {
if( !p_libvlc ) if( !p_libvlc )
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -1084,7 +1083,6 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release ) ...@@ -1084,7 +1083,6 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release )
vlc_cond_destroy (&priv->threads_wait); vlc_cond_destroy (&priv->threads_wait);
vlc_mutex_destroy (&priv->threads_lock); vlc_mutex_destroy (&priv->threads_lock);
if( b_release ) vlc_object_release( p_libvlc );
vlc_object_release( p_libvlc ); vlc_object_release( p_libvlc );
p_libvlc = NULL; p_libvlc = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment