Skip to content

V
vlc-2-2
Commit ae618924 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Used av_malloc/free for avcodec_decode_audio2 output buffer. 

It is needed to ensure valid buffer alignment.
parent 9ef7e90e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/codec/avcodec/audio.c
View file @ ae618924
......@@ -197,7 +197,7 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context,
if( p_sys->i_output_max < AVCODEC_MAX_AUDIO_FRAME_SIZE )
p_sys->i_output_max = AVCODEC_MAX_AUDIO_FRAME_SIZE;
msg_Dbg( p_dec, "Using %d bytes output buffer", p_sys->i_output_max );
p_sys->p_output = malloc( p_sys->i_output_max );
p_sys->p_output = av_malloc( p_sys->i_output_max );
p_sys->p_samples = NULL;
p_sys->i_samples = 0;
......@@ -300,7 +300,7 @@ aout_buffer_t * DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
if( i_output > p_sys->i_output_max )
{
/* Grow output buffer if necessary (eg. for PCM data) */
p_sys->p_output = realloc( p_sys->p_output, i_output );
p_sys->p_output = av_realloc( p_sys->p_output, i_output );
}
*pp_block = p_block = block_Realloc( p_block, 0, p_block->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE );
......@@ -384,7 +384,7 @@ void EndAudioDec( decoder_t *p_dec )
{
decoder_sys_t *p_sys = p_dec->p_sys;
free( p_sys->p_output );
av_free( p_sys->p_output );
}
/*****************************************************************************
......
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