Skip to content

V
vlc
Commit d6e9d55a authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Cleanup

parent eca6989d
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 12 deletions
modules/codec/zvbi.c
View file @ d6e9d55a
...@@ -168,17 +168,12 @@ static int Open( vlc_object_t *p_this ) ...@@ -168,17 +168,12 @@ static int Open( vlc_object_t *p_this )
decoder_sys_t *p_sys = NULL; decoder_sys_t *p_sys = NULL;
if( p_dec->fmt_in.i_codec != VLC_FOURCC('t','e','l','x') ) if( p_dec->fmt_in.i_codec != VLC_FOURCC('t','e','l','x') )
{
return VLC_EGENERIC; return VLC_EGENERIC;
}
p_dec->pf_decode_sub = Decode; p_dec->pf_decode_sub = Decode;
p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) ); p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) );
if( p_sys == NULL ) if( p_sys == NULL )
{
msg_Err( p_dec, "out of memory" );
return VLC_ENOMEM; return VLC_ENOMEM;
}
memset( p_sys, 0, sizeof(decoder_sys_t) ); memset( p_sys, 0, sizeof(decoder_sys_t) );
#if defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE) #if defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
...@@ -186,7 +181,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -186,7 +181,6 @@ static int Open( vlc_object_t *p_this )
if( !p_sys->p_image ) if( !p_sys->p_image )
{ {
free( p_sys ); free( p_sys );
msg_Err( p_dec, "out of memory" );
return VLC_ENOMEM; return VLC_ENOMEM;
} }
#endif #endif
......
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