diff options
Diffstat (limited to 'apps/codecs/libffmpegFLAC/decoder.c')
-rw-r--r-- | apps/codecs/libffmpegFLAC/decoder.c | 10 |
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 @@ | |||
42 | 42 | ||
43 | #include "decoder.h" | 43 | #include "decoder.h" |
44 | 44 | ||
45 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 45 | #if defined(CPU_COLDFIRE) |
46 | #include "coldfire.h" | 46 | #include "coldfire.h" |
47 | #elif defined(CPU_ARM) && !defined(SIMULATOR) | 47 | #elif defined(CPU_ARM) |
48 | #include "arm.h" | 48 | #include "arm.h" |
49 | #endif | 49 | #endif |
50 | 50 | ||
@@ -260,11 +260,11 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) | |||
260 | return -8; | 260 | return -8; |
261 | 261 | ||
262 | if ((s->bps + coeff_prec + av_log2(pred_order)) <= 32) { | 262 | if ((s->bps + coeff_prec + av_log2(pred_order)) <= 32) { |
263 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 263 | #if defined(CPU_COLDFIRE) |
264 | (void)sum; | 264 | (void)sum; |
265 | lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order, | 265 | lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order, |
266 | decoded + pred_order, coeffs); | 266 | decoded + pred_order, coeffs); |
267 | #elif defined(CPU_ARM) && !defined(SIMULATOR) | 267 | #elif defined(CPU_ARM) |
268 | (void)sum; | 268 | (void)sum; |
269 | lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order, | 269 | lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order, |
270 | decoded + pred_order, coeffs); | 270 | decoded + pred_order, coeffs); |
@@ -278,7 +278,7 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) | |||
278 | } | 278 | } |
279 | #endif | 279 | #endif |
280 | } else { | 280 | } else { |
281 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 281 | #if defined(CPU_COLDFIRE) |
282 | (void)wsum; | 282 | (void)wsum; |
283 | (void)j; | 283 | (void)j; |
284 | lpc_decode_emac_wide(s->blocksize - pred_order, qlevel, pred_order, | 284 | lpc_decode_emac_wide(s->blocksize - pred_order, qlevel, pred_order, |