From f02cba80967b7e42d03962625394bf5d1691a59c Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Thu, 10 May 2007 13:16:08 +0000 Subject: Code cleaning - remove some unnecessary defined(SIMULATOR) checks git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13369 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libffmpegFLAC/decoder.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/codecs/libffmpegFLAC/decoder.c') diff --git a/apps/codecs/libffmpegFLAC/decoder.c b/apps/codecs/libffmpegFLAC/decoder.c index 8a1f84c..88fcbfd 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, -- cgit v1.1