Commit d2e993b1 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Removed unneeded VLC_OBJECT() cast and another segfault fix.

parent 793dfac7
...@@ -330,7 +330,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -330,7 +330,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
if ( (i_flags & A52_CHANNEL_MASK) != (p_sys->i_flags & A52_CHANNEL_MASK) if ( (i_flags & A52_CHANNEL_MASK) != (p_sys->i_flags & A52_CHANNEL_MASK)
&& !p_sys->b_dontwarn ) && !p_sys->b_dontwarn )
{ {
msg_Warn( VLC_OBJECT(p_aout), msg_Warn( p_aout,
"liba52 couldn't do the requested downmix 0x%x->0x%x", "liba52 couldn't do the requested downmix 0x%x->0x%x",
p_sys->i_flags & A52_CHANNEL_MASK, p_sys->i_flags & A52_CHANNEL_MASK,
i_flags & A52_CHANNEL_MASK ); i_flags & A52_CHANNEL_MASK );
...@@ -349,7 +349,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -349,7 +349,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
if( a52_block( p_sys->p_liba52 ) ) if( a52_block( p_sys->p_liba52 ) )
{ {
msg_Warn( VLC_OBJECT(p_aout), "a52_block failed for block %d", i ); msg_Warn( p_aout, "a52_block failed for block %d", i );
} }
p_samples = a52_samples( p_sys->p_liba52 ); p_samples = a52_samples( p_sys->p_liba52 );
......
...@@ -303,7 +303,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -303,7 +303,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
if( !dts_syncinfo( p_sys->p_libdts, p_in_buf->p_buffer, &i_flags, if( !dts_syncinfo( p_sys->p_libdts, p_in_buf->p_buffer, &i_flags,
&i_sample_rate, &i_bit_rate, &i_frame_length ) ) &i_sample_rate, &i_bit_rate, &i_frame_length ) )
{ {
msg_Warn( VLC_OBJECT(p_aout), "libdts couldn't sync on frame" ); msg_Warn( p_aout, "libdts couldn't sync on frame" );
p_out_buf->i_nb_samples = p_out_buf->i_nb_bytes = 0; p_out_buf->i_nb_samples = p_out_buf->i_nb_bytes = 0;
return; return;
} }
...@@ -315,7 +315,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -315,7 +315,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
if ( (i_flags & DTS_CHANNEL_MASK) != (p_sys->i_flags & DTS_CHANNEL_MASK) if ( (i_flags & DTS_CHANNEL_MASK) != (p_sys->i_flags & DTS_CHANNEL_MASK)
&& !p_sys->b_dontwarn ) && !p_sys->b_dontwarn )
{ {
msg_Warn( VLC_OBJECT(p_aout), msg_Warn( p_aout,
"libdts couldn't do the requested downmix 0x%x->0x%x", "libdts couldn't do the requested downmix 0x%x->0x%x",
p_sys->i_flags & DTS_CHANNEL_MASK, p_sys->i_flags & DTS_CHANNEL_MASK,
i_flags & DTS_CHANNEL_MASK ); i_flags & DTS_CHANNEL_MASK );
...@@ -334,7 +334,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -334,7 +334,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
if( dts_block( p_sys->p_libdts ) ) if( dts_block( p_sys->p_libdts ) )
{ {
msg_Warn( p_filter, "dts_block failed for block %d", i ); msg_Warn( p_aout, "dts_block failed for block %d", i );
break; break;
} }
......
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