summaryrefslogtreecommitdiff
path: root/apps/codecs/libfaad/ps_dec.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/codecs/libfaad/ps_dec.c')
-rw-r--r--apps/codecs/libfaad/ps_dec.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/apps/codecs/libfaad/ps_dec.c b/apps/codecs/libfaad/ps_dec.c
index 335dac7b1c..2c7e5fdf47 100644
--- a/apps/codecs/libfaad/ps_dec.c
+++ b/apps/codecs/libfaad/ps_dec.c
@@ -159,10 +159,8 @@ typedef struct
159 159
160 160
161/* static variables */ 161/* static variables */
162#ifdef FAAD_STATIC_ALLOC
163static hyb_info s_hyb_info; 162static hyb_info s_hyb_info;
164static ps_info s_ps_info; 163static ps_info s_ps_info;
165#endif
166 164
167/* static function declarations */ 165/* static function declarations */
168static void ps_data_decode(ps_info *ps); 166static void ps_data_decode(ps_info *ps);
@@ -204,11 +202,7 @@ static void ps_mix_phase(ps_info *ps,
204 202
205static hyb_info *hybrid_init() 203static hyb_info *hybrid_init()
206{ 204{
207#ifdef FAAD_STATIC_ALLOC
208 hyb_info *hyb = &s_hyb_info; 205 hyb_info *hyb = &s_hyb_info;
209#else
210 hyb_info *hyb = (hyb_info*)faad_malloc(sizeof(hyb_info));
211#endif
212 206
213 hyb->resolution34[0] = 12; 207 hyb->resolution34[0] = 12;
214 hyb->resolution34[1] = 8; 208 hyb->resolution34[1] = 8;
@@ -1826,11 +1820,7 @@ ps_info *ps_init(uint8_t sr_index)
1826 uint8_t i; 1820 uint8_t i;
1827 uint8_t short_delay_band; 1821 uint8_t short_delay_band;
1828 1822
1829#ifdef FAAD_STATIC_ALLOC
1830 ps_info *ps = &s_ps_info; 1823 ps_info *ps = &s_ps_info;
1831#else
1832 ps_info *ps = (ps_info*)faad_malloc(sizeof(ps_info));
1833#endif
1834 memset(ps, 0, sizeof(ps_info)); 1824 memset(ps, 0, sizeof(ps_info));
1835 1825
1836 (void)sr_index; 1826 (void)sr_index;