Use block_Release instead of pf_release directly.

diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index b57876a5c4f9e8a4b920db9e1a2f009af7a4a26e..992541410b9b4365e823f0b1d4dd85fdd2954460 100644 (file)
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -669,7 +669,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;
     }
 
@@ -681,7 +682,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" );
-        if( p_block ) p_block->pf_release( p_block );
+        block_Release( p_block );
         return NULL;
     }
 
@@ -709,6 +710,6 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
     p_out->i_buffer = out_buf.i_nb_bytes;
     p_out->i_samples = out_buf.i_nb_samples;
 
-    if( p_block ) p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_out;
 }

diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index 5948f052239454e287f1c3272827d5936d915fa0..4c285b37c7fd308ac2cb0d1241ba35fc3654aca0 100644 (file)
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -471,7 +471,7 @@ 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 );
+            block_Release( p_block );
         return NULL;
     }
 
@@ -482,7 +482,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;
     }
     p_out->i_samples = (p_block->i_samples / p_filter->p_sys->i_nb_channels) *
@@ -529,7 +529,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
     p_out->i_buffer = out_buf.i_nb_bytes;
     p_out->i_samples = out_buf.i_nb_samples;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_out;
 }
 

diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index f95ce67f46b0faff2cc9f718563945ba846c370d..7fa42580da2a0bd97401a69bebed518b54f8491b 100644 (file)
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -233,7 +233,8 @@ static block_t *Filter( 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;
     }
 
@@ -245,7 +246,7 @@ static block_t *Filter( 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;
     }
 
@@ -269,7 +270,7 @@ static block_t *Filter( 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;

diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c
index 895d7d83181400b00b6d40624a8552bd106812e6..c78633e950e9e14d937581236c4be1a94cd84e89 100644 (file)
--- a/modules/audio_filter/converter/a52tofloat32.c
+++ b/modules/audio_filter/converter/a52tofloat32.c
@@ -473,7 +473,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;
     }
 
@@ -485,7 +486,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;
     }
 
@@ -512,7 +513,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
     p_out->i_buffer = out_buf.i_nb_bytes;
     p_out->i_samples = out_buf.i_nb_samples;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
 
     return p_out;
 }

diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c
index cc103e65b506171d470718b6e82f93cc50fccbd8..074c49c36bea1bb4a4e13cdb2a8f0186781caf73 100644 (file)
--- a/modules/audio_filter/converter/dtstofloat32.c
+++ b/modules/audio_filter/converter/dtstofloat32.c
@@ -431,7 +431,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;
     }
 
@@ -443,7 +444,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;
     }
 
@@ -470,7 +471,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
     p_out->i_buffer = out_buf.i_nb_bytes;
     p_out->i_samples = out_buf.i_nb_samples;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
 
     return p_out;
 }

diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index 1e2a773095a2c300ff880f5b5a2d8d7f01f5fb9b..5e8de153d5a9f2b5047bac3fdc16e2b0400fdc0c 100644 (file)
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -365,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;
     }
 
@@ -377,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;
     }
 
@@ -402,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;

diff --git a/modules/audio_filter/format.c b/modules/audio_filter/format.c
index e2eb38a8ed4239cc3ba7009cba86a57730c4f69b..78c8b02f2276e2ed286a608467eba2273ca0341d 100644 (file)
--- a/modules/audio_filter/format.c
+++ b/modules/audio_filter/format.c
@@ -355,7 +355,7 @@ static block_t *S24toFloat32( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -424,7 +424,7 @@ static block_t *S16toFloat32( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -457,7 +457,7 @@ static block_t *U16toFloat32( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -497,7 +497,7 @@ static block_t *S16toS24( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -632,7 +632,7 @@ static block_t *S8toU16( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -663,7 +663,7 @@ static block_t *U8toS16( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -695,7 +695,7 @@ static block_t *S8toS16( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -726,7 +726,7 @@ static block_t *U8toU16( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 

diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c
index badd99eafbbcf53a769fa24116e29083582f2ec9..ea339b59b2160cde53c984bcd94139c43a4a25c3 100644 (file)
--- a/modules/audio_filter/resampler/linear.c
+++ b/modules/audio_filter/resampler/linear.c
@@ -319,7 +319,8 @@ static block_t *Resample( 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;
     }
  
@@ -333,7 +334,7 @@ static block_t *Resample( 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;
     }
 
@@ -356,7 +357,7 @@ static block_t *Resample( 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;