Commit 2f662e48 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Fix double free bug in psychedelic filter

parent 594d7138
...@@ -115,6 +115,7 @@ static void Destroy( vlc_object_t *p_this ) ...@@ -115,6 +115,7 @@ static void Destroy( vlc_object_t *p_this )
if( p_filter->p_sys->p_image ) if( p_filter->p_sys->p_image )
image_HandlerDelete( p_filter->p_sys->p_image ); image_HandlerDelete( p_filter->p_sys->p_image );
p_filter->p_sys->p_image = NULL;
free( p_filter->p_sys ); free( p_filter->p_sys );
} }
...@@ -134,8 +135,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -134,8 +135,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
int x,y; int x,y;
uint8_t u,v; uint8_t u,v;
video_format_t fmt_out = {0};
picture_t *p_converted; picture_t *p_converted;
video_format_t fmt_out = {0};
fmt_out.p_palette = NULL;
if( !p_pic ) return NULL; if( !p_pic ) return NULL;
...@@ -175,7 +177,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -175,7 +177,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
p_outpic->p[Y_PLANE].p_pixels, p_pic->p[Y_PLANE].p_pixels, p_outpic->p[Y_PLANE].p_pixels, p_pic->p[Y_PLANE].p_pixels,
p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch ); p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch );
/* image visualization */ /* image visualization */
fmt_out = p_filter->fmt_out.video; fmt_out = p_filter->fmt_out.video;
fmt_out.i_width = p_filter->fmt_out.video.i_width*p_filter->p_sys->scale/150; fmt_out.i_width = p_filter->fmt_out.video.i_width*p_filter->p_sys->scale/150;
......
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