Removed unneeded VLC_OBJECT() cast and another segfault fix.

diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c
index ea5f0be7df9d859fc10d34ebf3c1189fd0b3f227..f91f1cb1b366a5df93dd5a9ac743a6ac111424f0 100644 (file)
--- a/modules/audio_filter/converter/a52tofloat32.c
+++ b/modules/audio_filter/converter/a52tofloat32.c
@@ -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)
           && !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",
                   p_sys->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,
 
         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 );

diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c
index 46df950d73008ffde898810ede020e78c7bc05e2..2116facf361873c2f957add4bcb59bd6d2718b2f 100644 (file)
--- a/modules/audio_filter/converter/dtstofloat32.c
+++ b/modules/audio_filter/converter/dtstofloat32.c
@@ -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,
                        &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;
         return;
     }
@@ -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)
           && !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",
                   p_sys->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,
 
         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;
         }