Skip to content

V
vlc-2-2
Commit f955a6aa authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* marq.c: compilation fixes for non c++ compilers

parent f4b976ef
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/video_filter/marq.c
View file @ f955a6aa
...@@ -94,6 +94,7 @@ static int CreateFilter( vlc_object_t *p_this ) ...@@ -94,6 +94,7 @@ static int CreateFilter( vlc_object_t *p_this )
{ {
filter_t *p_filter = (filter_t *)p_this; filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys; filter_sys_t *p_sys;
vlc_object_t *p_pl;
/* Allocate structure */ /* Allocate structure */
p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
...@@ -104,8 +105,7 @@ static int CreateFilter( vlc_object_t *p_this ) ...@@ -104,8 +105,7 @@ static int CreateFilter( vlc_object_t *p_this )
} }
/* hook to the playlist */ /* hook to the playlist */
vlc_object_t *p_pl = p_pl = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( !p_pl ) if( !p_pl )
{ {
return VLC_ENOOBJ; return VLC_ENOOBJ;
...@@ -138,13 +138,13 @@ static void DestroyFilter( vlc_object_t *p_this ) ...@@ -138,13 +138,13 @@ static void DestroyFilter( vlc_object_t *p_this )
{ {
filter_t *p_filter = (filter_t *)p_this; filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys; filter_sys_t *p_sys = p_filter->p_sys;
vlc_object_t *p_pl;
if( p_sys->psz_marquee ) free( p_sys->psz_marquee ); if( p_sys->psz_marquee ) free( p_sys->psz_marquee );
free( p_sys ); free( p_sys );
/* Delete the marquee variables from playlist */ /* Delete the marquee variables from playlist */
vlc_object_t *p_pl = p_pl = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( !p_pl ) if( !p_pl )
{ {
return; return;
......
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