summaryrefslogtreecommitdiff
path: root/apps/codecs/libfaad/sbr_dec.c
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-05-12 18:06:03 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-05-12 18:06:03 +0000
commit281666a066357ae2b69306239717743241be615a (patch)
treed0ecbad5673b68648b3a4a7f7c021a3ae0575eff /apps/codecs/libfaad/sbr_dec.c
parent2263cf35ab7f86ac1b4c2e6567a8164f8535d5ac (diff)
downloadrockbox-281666a066357ae2b69306239717743241be615a.zip
rockbox-281666a066357ae2b69306239717743241be615a.tar.gz
rockbox-281666a066357ae2b69306239717743241be615a.tar.bz2
rockbox-281666a066357ae2b69306239717743241be615a.tar.xz
The last submit had one define too much. Nevertheless fix the IRAM configuration for static allocation method.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29863 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libfaad/sbr_dec.c')
-rw-r--r--apps/codecs/libfaad/sbr_dec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/codecs/libfaad/sbr_dec.c b/apps/codecs/libfaad/sbr_dec.c
index d369868..4904c70 100644
--- a/apps/codecs/libfaad/sbr_dec.c
+++ b/apps/codecs/libfaad/sbr_dec.c
@@ -57,8 +57,8 @@ typedef struct {
/* static variables */
static XLR_t *p_XLR = NULL;
-#if defined(FAAD_STATIC_ALLOC) || defined(FAAD_HAVE_XLR_IN_IRAM)
-static XLR_t s_XLR IBSS_ATTR MEM_ALIGN_ATTR;
+#if defined(FAAD_STATIC_ALLOC) || defined(IBSS_ATTR_FAAD_XLR)
+static XLR_t s_XLR IBSS_ATTR_FAAD_XLR MEM_ALIGN_ATTR;
#endif
#if defined(FAAD_STATIC_ALLOC)
static sbr_info s_sbr[MAX_SYNTAX_ELEMENTS];
@@ -102,7 +102,7 @@ sbr_info *sbrDecodeInit(uint16_t framelength, uint8_t id_aac, uint8_t id_ele,
/* Allocate XLR temporary variable. Use static allocation if either
* FAAD_STATIC_ALLOC is set or XLR fits to IRAM. */
-#if defined(FAAD_STATIC_ALLOC) || defined(FAAD_HAVE_XLR_IN_IRAM)
+#if defined(FAAD_STATIC_ALLOC) || defined(IBSS_ATTR_FAAD_XLR)
p_XLR = &s_XLR;
#else
p_XLR = (XLR_t*)faad_malloc(sizeof(XLR_t));