Commit d6c0a965 authored by Rémi Duraffort's avatar Rémi Duraffort

visual: no need to strdup the name of the effect as it's only use with strcmp.

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