Minor correction to macros, beautification of loop.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27391 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 4 insertions, 4 deletions

diff --git a/apps/codecs/libfaad/sbr_dct.c b/apps/codecs/libfaad/sbr_dct.c
index f471745813..f22a24a18e 100644
--- a/apps/codecs/libfaad/sbr_dct.c
+++ b/apps/codecs/libfaad/sbr_dct.c
@@ -1535,7 +1535,7 @@ const uint32_t dct4_revtab[32] ICONST_ATTR = {
     x_im = imag_part; \
     tmp  = MUL_C(x_re + x_im, tab[tabidx++]); \
     out1 = MUL_C(x_re       , tab[tabidx++]) + tmp; \
-    out2 = MUL_C(x_im       , tab[tabidx++]) + tmp; \
+    out2 = MUL_C(x_im       , tab[tabidx++]) + tmp;
 
 /* size 64 only! */
 void dct4_kernel(real_t *real, real_t *imag)
diff --git a/apps/codecs/libfaad/sbr_qmf.c b/apps/codecs/libfaad/sbr_qmf.c
index beb0c6496e..a0b01661f8 100644
--- a/apps/codecs/libfaad/sbr_qmf.c
+++ b/apps/codecs/libfaad/sbr_qmf.c
@@ -98,7 +98,7 @@ void sbr_qmf_analysis_32(sbr_info *sbr, qmfa_info *qmfa, const real_t *input,
 
         /* add new samples to input buffer x */
         idx0 = qmfa->x_index + 31; idx1 = idx0 + 320;
-        for (n = 32 - 1; n >= 0; n-=4)
+        for (n = 0; n < 32; n+=4)
         {
             qmfa->x[idx0--] = qmfa->x[idx1--] = (input[in++]);
             qmfa->x[idx0--] = qmfa->x[idx1--] = (input[in++]);
@@ -390,11 +390,11 @@ void sbr_qmf_synthesis_64(sbr_info *sbr, qmfs_info *qmfs, qmf_t X[MAX_NTSRHFG][6
 
 #define FAAD_CMPLX_PRETWIDDLE_SUB(k) \
         (MUL_F(QMF_RE(X[l][k]), RE(qmf32_pre_twiddle[k])) - \
-         MUL_F(QMF_IM(X[l][k]), IM(qmf32_pre_twiddle[k]))) \
+         MUL_F(QMF_IM(X[l][k]), IM(qmf32_pre_twiddle[k])))
         
 #define FAAD_CMPLX_PRETWIDDLE_ADD(k) \
         (MUL_F(QMF_IM(X[l][k]), RE(qmf32_pre_twiddle[k])) + \
-         MUL_F(QMF_RE(X[l][k]), IM(qmf32_pre_twiddle[k]))) \
+         MUL_F(QMF_RE(X[l][k]), IM(qmf32_pre_twiddle[k])))
 
 void sbr_qmf_synthesis_32(sbr_info *sbr, qmfs_info *qmfs, qmf_t X[MAX_NTSRHFG][64],
                           real_t *output)