diff --git a/apps/codecs/libfaad/bits.c b/apps/codecs/libfaad/bits.c
index f1a36235bd..8c70a86204 100644
--- a/apps/codecs/libfaad/bits.c
+++ b/apps/codecs/libfaad/bits.c
@@ -138,13 +138,13 @@ void faad_rewindbits(bitfile *ld)
 
     tmp = ld->start[0];
 #ifndef ARCH_IS_BIG_ENDIAN
-    BSWAP(tmp);
+    tmp = BSWAP(tmp);
 #endif
     ld->bufa = tmp;
 
     tmp = ld->start[1];
 #ifndef ARCH_IS_BIG_ENDIAN
-    BSWAP(tmp);
+    tmp = BSWAP(tmp);
 #endif
     ld->bufb = tmp;
     ld->bits_left = 32;
diff --git a/apps/codecs/libfaad/codebook/hcb_10.h b/apps/codecs/libfaad/codebook/hcb_10.h
index 971d06aaf0..af48711460 100644
--- a/apps/codecs/libfaad/codebook/hcb_10.h
+++ b/apps/codecs/libfaad/codebook/hcb_10.h
@@ -115,7 +115,7 @@ static hcb hcb10_1[] ICONST_ATTR_FAAD_LARGE_IRAM = {
  *
  * Gives size of codeword and actual data (x,y,v,w)
  */
-static hcb_2_pair hcb10_2[] ICONST_ATTR = {
+static hcb_2_pair hcb10_2[] ICONST_ATTR_FAAD_LARGE_IRAM = {
     /* 4 bit codewords */
     { 4,  1,  1 },
     { 4,  1,  2 },