4 files changed, 10 insertions, 1 deletions

diff --git a/apps/codecs/SOURCES b/apps/codecs/SOURCES
index 670dc2e2e6..5dc7f31c56 100644
--- a/apps/codecs/SOURCES
+++ b/apps/codecs/SOURCES
@@ -15,8 +15,9 @@ sid.c
 ape.c
 nsf.c
 asap.c
-#if MEMORYSIZE > 2
 aac.c
+
+#if MEMORYSIZE > 2
 spc.c
 #endif
 mod.c
diff --git a/apps/codecs/libfaad/common.h b/apps/codecs/libfaad/common.h
index a9c67a5459..ea028b1b8e 100644
--- a/apps/codecs/libfaad/common.h
+++ b/apps/codecs/libfaad/common.h
@@ -86,8 +86,10 @@ extern struct codec_api* ci;
 
 /* Allow decoding of MAIN profile AAC */
 #define MAIN_DEC
+#if MEMORYSIZE > 2
 /* Allow decoding of SSR profile AAC */
 #define SSR_DEC
+#endif
 /* Allow decoding of LTP profile AAC */
 #define LTP_DEC
 /* Allow decoding of LD profile AAC */
@@ -123,9 +125,11 @@ extern struct codec_api* ci;
   #undef ERROR_RESILIENCE
 #endif
 
+#if MEMORYSIZE > 2
 #define SBR_DEC
 //#define SBR_LOW_POWER
 #define PS_DEC
+#endif
 
 /* FIXED POINT: No MAIN decoding */
 #ifdef FIXED_POINT
diff --git a/apps/codecs/libfaad/specrec.c b/apps/codecs/libfaad/specrec.c
index 87470f54f4..de57c4b7ce 100644
--- a/apps/codecs/libfaad/specrec.c
+++ b/apps/codecs/libfaad/specrec.c
@@ -719,6 +719,8 @@ static uint8_t allocate_single_channel(NeAACDecHandle hDecoder, uint8_t channel,
             memset(hDecoder->time_out[channel+1], 0, mul*hDecoder->frameLength*sizeof(real_t));
         }
     }
+#else
+    (void)output_channels;  /*silence warning when PS disabled*/
 #endif
 
     if (hDecoder->fb_intermed[channel] == NULL)
diff --git a/apps/codecs/libfaad/syntax.c b/apps/codecs/libfaad/syntax.c
index 9476029932..fa077d4e94 100644
--- a/apps/codecs/libfaad/syntax.c
+++ b/apps/codecs/libfaad/syntax.c
@@ -1058,6 +1058,8 @@ static uint8_t fill_element(NeAACDecHandle hDecoder, bitfile *ld, drc_info *drc
             }
 #endif
         } else {
+#else
+        (void)hDecoder;
 #endif
             while (count > 0)
             {