Commit 60f4db26 authored by Antoine Cellerier's avatar Antoine Cellerier

Please keep the coding style consistent inside the same source file.

parent e560aff7
...@@ -359,11 +359,11 @@ static inline char *__var_GetString( vlc_object_t *p_obj, const char *psz_name ) ...@@ -359,11 +359,11 @@ static inline char *__var_GetString( vlc_object_t *p_obj, const char *psz_name )
static inline char *__var_GetNonEmptyString( vlc_object_t *obj, const char *name ) static inline char *__var_GetNonEmptyString( vlc_object_t *obj, const char *name )
{ {
vlc_value_t val; vlc_value_t val;
if (__var_Get (obj, name, &val)) if( __var_Get( obj, name, &val ) )
return NULL; return NULL;
if (*val.psz_string) if( *val.psz_string )
return val.psz_string; return val.psz_string;
free (val.psz_string); free( val.psz_string );
return NULL; return NULL;
} }
......
...@@ -274,8 +274,8 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -274,8 +274,8 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
char *psz_prefix; char *psz_prefix;
char *psz_tmp; char *psz_tmp;
memset (&fmt_in, 0, sizeof (fmt_in)); memset( &fmt_in, 0, sizeof( fmt_in ) );
memset (&fmt_out, 0, sizeof (fmt_out)); memset( &fmt_out, 0, sizeof( fmt_out ) );
if( p_vout->p_sys->i_frames % p_vout->p_sys->i_ratio != 0 ) if( p_vout->p_sys->i_frames % p_vout->p_sys->i_ratio != 0 )
{ {
......
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