]> git.sesse.net Git - vlc/commitdiff
visual: no need to strdup the name of the effect as it's only use with strcmp.
authorRémi Duraffort <ivoire@videolan.org>
Sat, 30 May 2009 09:15:13 +0000 (11:15 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Sat, 30 May 2009 09:18:50 +0000 (11:18 +0200)
modules/visualization/visual/visual.c
modules/visualization/visual/visual.h

index 27055e258adefaaf6df9f72b434219f73d800c87..70536a683f8f2c350c7e3b2a58e9f42cb934f1d2 100644 (file)
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * visual.c : Visualisation system
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@via.ecp.fr>
@@ -243,7 +243,7 @@ static int Open( vlc_object_t *p_this )
                               strlen( pf_effect_run[i].psz_name ) ) )
             {
                 p_effect->pf_run = pf_effect_run[i].pf_run;
-                p_effect->psz_name = strdup( pf_effect_run[i].psz_name );
+                p_effect->psz_name = pf_effect_run[i].psz_name;
                 break;
             }
         }
@@ -261,7 +261,6 @@ static int Open( vlc_object_t *p_this )
                 if( ( psz_eoa = strchr( psz_parser, '}') ) == NULL )
                 {
                    msg_Err( p_filter, "unable to parse effect list. Aborting");
-                   free( p_effect->psz_name );
                    free( p_effect );
                    break;
                 }
@@ -314,7 +313,6 @@ static int Open( vlc_object_t *p_this )
         msg_Err( p_filter, "no suitable vout module" );
         for( int i = 0; i < p_sys->i_effect; i++ )
         {
-            free( p_sys->effect[i]->psz_name );
             free( p_sys->effect[i]->psz_args );
             free( p_sys->effect[i] );
         }
@@ -404,7 +402,6 @@ static void Close( vlc_object_t *p_this )
             free( ( ( spectrum_data * )p_effect->p_data )->prev_heights );
         }
         free( p_effect->p_data );
-        free( p_effect->psz_name );
         free( p_effect->psz_args );
         free( p_effect );
 #undef p_effect
index 415d69f2a7aa276cc176eb36d703ba84972447f0..11edd5866daade10b469b277d20565bf634c6129 100644 (file)
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * visual.h : Header for the visualisation system
  *****************************************************************************
- * Copyright (C) 2002 the VideoLAN team
+ * Copyright (C) 2002-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@via.ecp.fr>
 
 typedef struct visual_effect_t
 {
-    char *     psz_name;    /* Filter name*/
+    const char *psz_name;    /* Filter name*/
 
-    int         (*pf_run)( struct visual_effect_t * , aout_instance_t *,
-                           aout_buffer_t *, picture_t *);
+    int        (*pf_run)( struct visual_effect_t * , aout_instance_t *,
+                          aout_buffer_t *, picture_t *);
     void *     p_data; /* The effect stores whatever it wants here */
     int        i_width;
     int        i_height;