summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/codecs/libffmpegFLAC/SOURCES2
-rw-r--r--apps/codecs/libffmpegFLAC/decoder.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/apps/codecs/libffmpegFLAC/SOURCES b/apps/codecs/libffmpegFLAC/SOURCES
index 439a203a82..5fbc6fd00f 100644
--- a/apps/codecs/libffmpegFLAC/SOURCES
+++ b/apps/codecs/libffmpegFLAC/SOURCES
@@ -4,4 +4,6 @@ shndec.c
4tables.c 4tables.c
5#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) 5#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
6coldfire.S 6coldfire.S
7#elif defined(CPU_ARM) && !defined(SIMULATOR)
8arm.S
7#endif 9#endif
diff --git a/apps/codecs/libffmpegFLAC/decoder.c b/apps/codecs/libffmpegFLAC/decoder.c
index 082bb99b6a..9c85864e26 100644
--- a/apps/codecs/libffmpegFLAC/decoder.c
+++ b/apps/codecs/libffmpegFLAC/decoder.c
@@ -44,6 +44,8 @@
44 44
45#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) 45#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
46#include "coldfire.h" 46#include "coldfire.h"
47#elif defined(CPU_ARM) && !defined(SIMULATOR)
48#include "arm.h"
47#endif 49#endif
48 50
49#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) 51#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
@@ -261,6 +263,9 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order)
261 #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) 263 #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
262 (void)sum; 264 (void)sum;
263 lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order, decoded + pred_order, coeffs); 265 lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order, decoded + pred_order, coeffs);
266 #elif defined(CPU_ARM) && !defined(SIMULATOR)
267 (void)sum;
268 lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order, decoded + pred_order, coeffs);
264 #else 269 #else
265 for (i = pred_order; i < s->blocksize; i++) 270 for (i = pred_order; i < s->blocksize; i++)
266 { 271 {