diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-05-09 15:55:33 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-05-09 15:55:33 +0200 |
| commit | 1e71123be300aa08325aca68f12d54e7149bd820 (patch) | |
| tree | 00f2e457fd5a860d70deb5008eb44c60da0dbbde /src/combined/ffmpeg/ff_audio_decoder.c | |
| parent | c99cd9519a56b2d7c60fa30e9fecd02f08336671 (diff) | |
| download | xine-lib-1e71123be300aa08325aca68f12d54e7149bd820.tar.gz xine-lib-1e71123be300aa08325aca68f12d54e7149bd820.tar.bz2 | |
Remove a new bunch of xine_malloc() calls.
Also don't reset memory after it's allocated if we do that with
calloc.
Diffstat (limited to 'src/combined/ffmpeg/ff_audio_decoder.c')
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index de45cc1a2..4d8e440bb 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -249,8 +249,8 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) break; /* abort early - extradata length is bad */ this->context->extradata_size = data_len; - this->context->extradata = xine_xmalloc(this->context->extradata_size + - FF_INPUT_BUFFER_PADDING_SIZE); + this->context->extradata = malloc(this->context->extradata_size + + FF_INPUT_BUFFER_PADDING_SIZE); xine_fast_memcpy (this->context->extradata, this->buf + extradata, this->context->extradata_size); break; @@ -284,8 +284,8 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) (buf->decoder_info[1] == BUF_SPECIAL_STSD_ATOM)) { this->context->extradata_size = buf->decoder_info[2]; - this->context->extradata = xine_xmalloc(buf->decoder_info[2] + - FF_INPUT_BUFFER_PADDING_SIZE); + this->context->extradata = malloc(buf->decoder_info[2] + + FF_INPUT_BUFFER_PADDING_SIZE); memcpy(this->context->extradata, buf->decoder_info_ptr[2], buf->decoder_info[2]); |