Fix a few bugs

diff --git a/src/misc/variables.c b/src/misc/variables.c
index c6b4c24fe22f9e805da91ddaae8da655d22270f1..1dd6235bdef426231c4e3879ca971a27d3b3b91c 100644 (file)
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -275,7 +275,7 @@ int __var_Create( vlc_object_t *p_this, const char *psz_name, int i_type )
         vlc_value_t val;
 
         if( InheritValue( p_this, psz_name, &val, p_var->i_type )
-            == VLC_SUCCESS );
+            == VLC_SUCCESS )
         {
             /* Free data if needed */
             p_var->pf_free( &p_var->val );
@@ -619,7 +619,7 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name,
                 vlc_value_t val;
 
                 if( InheritValue( p_this, psz_name, &val, p_var->i_type )
-                    == VLC_SUCCESS );
+                    == VLC_SUCCESS )
                 {
                     /* Duplicate already done */
 

diff --git a/src/playlist/control.c b/src/playlist/control.c
index aa84a184af88b4494121b40a440437f572685d41..5af18b90c1342d78062411879f48a9e4b4fffef6 100644 (file)
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -232,7 +232,7 @@ int playlist_AskForArtEnqueue( playlist_t *p_playlist,
                  p_playlist->p_secondary_preparse->i_waiting,
                  i, p );
     vlc_mutex_unlock( &p_playlist->p_secondary_preparse->object_lock );
-    vlc_cond_signal( &p_playlist->p_secondary_preparse->object_lock );
+    vlc_cond_signal( &p_playlist->p_secondary_preparse->object_wait );
     return VLC_SUCCESS;
 }
 

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index a3cc707a6fe2b4dc4279557c824873ef597029c6..e7b8e578666170d71c5f6149ed294b6ec42f534e 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -206,19 +206,15 @@ static void EndPlaylist( playlist_t *p_playlist )
  *****************************************************************************/
 static void RunPreparse ( playlist_preparse_t *p_obj )
 {
-    playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
     /* Tell above that we're ready */
     vlc_thread_ready( p_obj );
-
     playlist_PreparseLoop( p_obj );
 }
 
 static void RunSecondaryPreparse( playlist_secondary_preparse_t *p_obj )
 {
-    playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
     /* Tell above that we're ready */
     vlc_thread_ready( p_obj );
-
     playlist_SecondaryPreparseLoop( p_obj );
 }
 

diff --git a/src/stream_output/profiles.c b/src/stream_output/profiles.c
index f7ec13b0ed840d7eca68eab54364dd9e0159bf4c..8bab246686fe67ed2cd42057bd00083bd5ac5b26 100644 (file)
--- a/src/stream_output/profiles.c
+++ b/src/stream_output/profiles.c
@@ -240,7 +240,7 @@ void streaming_ParameterApply( sout_param_t *p_param, char **ppsz_dest,
             break;
         case VLC_VAR_STRING:
             assert( ppsz_dest );
-            FREENULL( **ppsz_dest );
+            free( *ppsz_dest );
             *ppsz_dest = p_param->value.psz_string ?
                                 strdup( p_param->value.psz_string ) :
                                 NULL;