No need to check for a NULL as libvlc_media_release is checking.

diff --git a/src/control/media_list.c b/src/control/media_list.c
index e043c4ccd2ce942acf1329789b7dde2b0f260ef9..75389c6937926bd5def54d201d6e72ab69ffc9fa 100644 (file)
--- a/src/control/media_list.c
+++ b/src/control/media_list.c
@@ -201,8 +201,7 @@ void libvlc_media_list_release( libvlc_media_list_t * p_mlist )
 
     libvlc_event_manager_release( p_mlist->p_event_manager );
 
-    if( p_mlist->p_md )
-        libvlc_media_release( p_mlist->p_md );
+    libvlc_media_release( p_mlist->p_md );
 
     for ( i = 0; i < vlc_array_count( &p_mlist->items ); i++ )
     {
@@ -279,8 +278,7 @@ void libvlc_media_list_set_media( libvlc_media_list_t * p_mlist,
 {
     VLC_UNUSED(p_e);
     vlc_mutex_lock( &p_mlist->object_lock );
-    if( p_mlist->p_md )
-        libvlc_media_release( p_mlist->p_md );
+    libvlc_media_release( p_mlist->p_md );
     libvlc_media_retain( p_md );
     p_mlist->p_md = p_md;
     vlc_mutex_unlock( &p_mlist->object_lock );

diff --git a/src/control/media_player.c b/src/control/media_player.c
index 126eef9cdb71dc013de04f1db5e60ec4ec87427a..48b4b76e521d8370435facd623ed465931a950eb 100644 (file)
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -391,8 +391,7 @@ static void libvlc_media_player_destroy( libvlc_media_player_t *p_mi )
         release_input_thread( p_mi, true );
 
     libvlc_event_manager_release( p_mi->p_event_manager );
-    if( p_mi->p_md )
-        libvlc_media_release( p_mi->p_md );
+    libvlc_media_release( p_mi->p_md );
     vlc_mutex_destroy( &p_mi->object_lock );
     free( p_mi );
 }