Skip to content

V
vlc-1.1
Commit c5c06b64 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

Merge branch '1.0-bugfix' 

Conflicts:

	src/input/input.c
parents ca07b0f9 622c64a1
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
modules/misc/logger.c
View file @ c5c06b64
...@@ -348,11 +348,10 @@ static void SyslogPrint( const msg_item_t *p_msg ) ...@@ -348,11 +348,10 @@ static void SyslogPrint( const msg_item_t *p_msg )
int i_priority = i_prio[p_msg->i_type]; int i_priority = i_prio[p_msg->i_type];
if( p_msg->psz_header ) if( p_msg->psz_header )
syslog( i_priority, "%s%s %s: %s", p_msg->psz_header, syslog( i_priority, "%s %s%s%s", p_msg->psz_header, p_msg->psz_module,
ppsz_type[p_msg->i_type], ppsz_type[p_msg->i_type], p_msg->psz_msg );
p_msg->psz_module, p_msg->psz_msg );
else else
syslog( i_priority, "%s%s: %s", p_msg->psz_module, syslog( i_priority, "%s%s%s", p_msg->psz_module,
ppsz_type[p_msg->i_type], p_msg->psz_msg ); ppsz_type[p_msg->i_type], p_msg->psz_msg );
} }
......
src/input/input.c
View file @ c5c06b64
...@@ -1138,7 +1138,6 @@ static void InitPrograms( input_thread_t * p_input ) ...@@ -1138,7 +1138,6 @@ static void InitPrograms( input_thread_t * p_input )
{ {
demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1, demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1,
val.p_list ); val.p_list );
var_FreeList( &val, NULL );
} }
else else
{ {
......
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