1 files changed, 9 insertions, 6 deletions

diff --git a/apps/codecs/libfaad/common.h b/apps/codecs/libfaad/common.h
index 9179a6e21c..08f4c7ab53 100644
--- a/apps/codecs/libfaad/common.h
+++ b/apps/codecs/libfaad/common.h
@@ -56,30 +56,30 @@ extern struct codec_api* ci;
 #define IBSS_ATTR_FAAD_LARGE_IRAM   IBSS_ATTR
 #define ICODE_ATTR_FAAD_LARGE_IRAM
 #define ICONST_ATTR_FAAD_LARGE_IRAM ICONST_ATTR
-#define IBSS_ATTR_FAAD_XLARGE_IRAM
 
 #elif (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024)
 /* Enough IRAM to move additional data and code to it. */
 #define IBSS_ATTR_FAAD_LARGE_IRAM   IBSS_ATTR
 #define ICODE_ATTR_FAAD_LARGE_IRAM  ICODE_ATTR
 #define ICONST_ATTR_FAAD_LARGE_IRAM ICONST_ATTR
-#define IBSS_ATTR_FAAD_XLARGE_IRAM
 
 #elif defined(CPU_S5L870X)
 /* Very large IRAM. Move even more data to it. */
 #define IBSS_ATTR_FAAD_LARGE_IRAM   IBSS_ATTR
 #define ICODE_ATTR_FAAD_LARGE_IRAM  ICODE_ATTR
 #define ICONST_ATTR_FAAD_LARGE_IRAM ICONST_ATTR
-#define IBSS_ATTR_FAAD_XLARGE_IRAM  IBSS_ATTR
+#define FAAD_HAVE_XLR_IN_IRAM
 
 #else
 /* Not enough IRAM available. */
 #define IBSS_ATTR_FAAD_LARGE_IRAM
 #define ICODE_ATTR_FAAD_LARGE_IRAM
 #define ICONST_ATTR_FAAD_LARGE_IRAM
-#define IBSS_ATTR_FAAD_XLARGE_IRAM
 #endif
 
+/* Used to allocate several SBR + PS arrays and variables statically. */
+//#define FAAD_STATIC_ALLOC
+
 #define INLINE __inline
 #if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
 #define ALIGN __declspec(align(16))
@@ -442,8 +442,11 @@ uint8_t max_tns_sfb(const uint8_t sr_index, const uint8_t object_type,
 uint32_t get_sample_rate(const uint8_t sr_index);
 int8_t can_decode_ot(const uint8_t object_type);
 
-void *faad_malloc(size_t size);
-void faad_free(void *b);
+#ifndef FAAD_STATIC_ALLOC
+/* Those should not be defined or used anymore */
+#define faad_malloc(A) malloc(A)
+#define faad_free(A)   free(A)
+#endif
 
 //#define PROFILE
 #ifdef PROFILE