summaryrefslogtreecommitdiffstats
path: root/apps/codecs/libffmpegFLAC/decoder.c
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2007-05-10 13:16:08 +0000
committerDave Chapman <dave@dchapman.com>2007-05-10 13:16:08 +0000
commitf02cba80967b7e42d03962625394bf5d1691a59c (patch)
treeab752be0024ec544500eaf6fcba4207848c9a89e /apps/codecs/libffmpegFLAC/decoder.c
parent1fc2d91a83f6154c11a203c8da993d647799691a (diff)
downloadrockbox-f02cba80967b7e42d03962625394bf5d1691a59c.tar.gz
rockbox-f02cba80967b7e42d03962625394bf5d1691a59c.zip
Code cleaning - remove some unnecessary defined(SIMULATOR) checks
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13369 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libffmpegFLAC/decoder.c')
-rw-r--r--apps/codecs/libffmpegFLAC/decoder.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/codecs/libffmpegFLAC/decoder.c b/apps/codecs/libffmpegFLAC/decoder.c
index 8a1f84c6b6..88fcbfd0bd 100644
--- a/apps/codecs/libffmpegFLAC/decoder.c
+++ b/apps/codecs/libffmpegFLAC/decoder.c
@@ -42,9 +42,9 @@
#include "decoder.h"
-#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
+#if defined(CPU_COLDFIRE)
#include "coldfire.h"
-#elif defined(CPU_ARM) && !defined(SIMULATOR)
+#elif defined(CPU_ARM)
#include "arm.h"
#endif
@@ -260,11 +260,11 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order)
return -8;
if ((s->bps + coeff_prec + av_log2(pred_order)) <= 32) {
- #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
+ #if defined(CPU_COLDFIRE)
(void)sum;
lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order,
decoded + pred_order, coeffs);
- #elif defined(CPU_ARM) && !defined(SIMULATOR)
+ #elif defined(CPU_ARM)
(void)sum;
lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order,
decoded + pred_order, coeffs);
@@ -278,7 +278,7 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order)
}
#endif
} else {
- #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
+ #if defined(CPU_COLDFIRE)
(void)wsum;
(void)j;
lpc_decode_emac_wide(s->blocksize - pred_order, qlevel, pred_order,