diff options
Diffstat (limited to 'libfaad2/ssr_fb.c')
| -rw-r--r-- | libfaad2/ssr_fb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libfaad2/ssr_fb.c b/libfaad2/ssr_fb.c index d21c1a9892..59da2e9623 100644 --- a/libfaad2/ssr_fb.c +++ b/libfaad2/ssr_fb.c @@ -1,6 +1,6 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com +** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: ssr_fb.c,v 1.3 2003/09/09 18:09:52 menno Exp $ +** $Id: ssr_fb.c,v 1.2 2003/10/03 22:22:27 alex Exp $ **/ #include "common.h" @@ -42,7 +42,7 @@ fb_info *ssr_filter_bank_init(uint16_t frame_len) { uint16_t nshort = frame_len/8; - fb_info *fb = (fb_info*)malloc(sizeof(fb_info)); + fb_info *fb = (fb_info*)faad_malloc(sizeof(fb_info)); memset(fb, 0, sizeof(fb_info)); /* normal */ @@ -62,7 +62,7 @@ void ssr_filter_bank_end(fb_info *fb) faad_mdct_end(fb->mdct256); faad_mdct_end(fb->mdct2048); - if (fb) free(fb); + if (fb) faad_free(fb); } static INLINE void imdct_ssr(fb_info *fb, real_t *in_data, @@ -102,7 +102,7 @@ void ssr_ifilter_bank(fb_info *fb, uint8_t window_sequence, uint8_t window_shape uint16_t nflat_ls = (nlong-nshort)/2; - transf_buf = (real_t*)malloc(2*nlong*sizeof(real_t)); + transf_buf = (real_t*)faad_malloc(2*nlong*sizeof(real_t)); window_long = fb->long_window[window_shape]; window_long_prev = fb->long_window[window_shape_prev]; @@ -175,7 +175,7 @@ void ssr_ifilter_bank(fb_info *fb, uint8_t window_sequence, uint8_t window_shape break; } - free(transf_buf); + faad_free(transf_buf); } |