Skip to content

V
vlc-1.1
Commit ff6b945f authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed segfault when the subpicture scaler failed.

parent f351451d
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
src/video_output/vout_subpictures.c
View file @ ff6b945f
...@@ -785,11 +785,18 @@ static void SpuRenderRegion( spu_t *p_spu, ...@@ -785,11 +785,18 @@ static void SpuRenderRegion( spu_t *p_spu,
p_pic = p_scale->pf_video_filter( p_scale, &p_region->p_cache->picture ); p_pic = p_scale->pf_video_filter( p_scale, &p_region->p_cache->picture );
else else
msg_Err( p_spu, "scaling failed (module not loaded)" ); msg_Err( p_spu, "scaling failed (module not loaded)" );
if( p_pic ) if( p_pic )
{ {
p_region->p_cache->picture = *p_pic; p_region->p_cache->picture = *p_pic;
free( p_pic ); free( p_pic );
} }
else
{
p_subpic->pf_destroy_region( VLC_OBJECT(p_spu),
p_region->p_cache );
p_region->p_cache = NULL;
}
} }
/* And use the scaled picture */ /* And use the scaled picture */
......
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