Commit d3ed2c8a authored by Laurent Aimar's avatar Laurent Aimar

Use block_Release instead of pf_release directly.

parent 96a6323f
......@@ -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;
}
......@@ -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;
}
......
......@@ -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;
......
......@@ -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;
}
......@@ -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;
}
......@@ -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;
......
......@@ -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;
}
......
......@@ -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;
......
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