Use block_Release instead of pf_release directly.

[vlc] / modules / audio_filter / converter / mpgatofixed32.c

diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index 70d6bdda05ca1be6b2d0d8017c03edfa4f05abbc..5e8de153d5a9f2b5047bac3fdc16e2b0400fdc0c 100644 (file)
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -33,7 +33,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_block.h>
 #include "vlc_filter.h"
@@ -68,12 +69,12 @@ struct filter_sys_t
 vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACODEC );
-    set_description( _("MPEG audio decoder") );
+    set_description( N_("MPEG audio decoder") );
     set_capability( "audio filter", 100 );
     set_callbacks( Create, Destroy );
 
     add_submodule();
-    set_description( _("MPEG audio decoder") );
+    set_description( N_("MPEG audio decoder") );
     set_capability( "audio filter2", 100 );
     set_callbacks( OpenFilter, CloseFilter );
 vlc_module_end();
@@ -103,10 +104,7 @@ static int Create( vlc_object_t *p_this )
     p_sys = malloc( sizeof(filter_sys_t) );
     p_filter->p_sys = (struct aout_filter_sys_t *)p_sys;
     if( p_sys == NULL )
-    {
-        msg_Err( p_filter, "out of memory" );
         return -1;
-    }
 
     /* Initialize libmad */
     mad_stream_init( &p_sys->mad_stream );
@@ -215,8 +213,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
             break;
 
         case 1:
-            p_filter->p_libvlc->pf_memcpy( p_samples, p_left,
-                                        i_samples * sizeof(mad_fixed_t) );
+            vlc_memcpy( p_samples, p_left, i_samples * sizeof(mad_fixed_t) );
             break;
 
         default:
@@ -316,10 +313,7 @@ static int OpenFilter( vlc_object_t *p_this )
     /* Allocate the memory needed to store the module's structure */
     p_sys = p_filter->p_sys = malloc( sizeof(filter_sys_t) );
     if( p_sys == NULL )
-    {
-        msg_Err( p_filter, "out of memory" );
         return -1;
-    }
     p_sys->i_reject_count = 0;
 
     p_filter->pf_audio_filter = Convert;
@@ -335,6 +329,8 @@ static int OpenFilter( vlc_object_t *p_this )
     else
         p_filter->fmt_out.i_codec = VLC_FOURCC('f','i','3','2');
     p_filter->fmt_out.audio.i_format = p_filter->fmt_out.i_codec;
+    p_filter->fmt_out.audio.i_bitspersample =
+        aout_BitsPerSample( p_filter->fmt_out.i_codec );
 
     p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate;
 
@@ -369,7 +365,8 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
 
     if( !p_block || !p_block->i_samples )
     {
-        if( p_block ) p_block->pf_release( p_block );
+        if( p_block )
+            block_Release( p_block );
         return NULL;
     }
 
@@ -381,7 +378,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
     if( !p_out )
     {
         msg_Warn( p_filter, "can't get output buffer" );
-        p_block->pf_release( p_block );
+        block_Release( p_block );
         return NULL;
     }
 
@@ -406,7 +403,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
 
     DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf );
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
 
     p_out->i_buffer = out_buf.i_nb_bytes;
     p_out->i_samples = out_buf.i_nb_samples;