diff options
Diffstat (limited to 'apps/codecs/libffmpegFLAC')
| -rw-r--r-- | apps/codecs/libffmpegFLAC/SOURCES | 2 | ||||
| -rw-r--r-- | apps/codecs/libffmpegFLAC/decoder.c | 5 |
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 tables.c #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) coldfire.S +#elif defined(CPU_ARM) && !defined(SIMULATOR) +arm.S #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 @@ #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) #include "coldfire.h" +#elif defined(CPU_ARM) && !defined(SIMULATOR) +#include "arm.h" #endif #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) #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) (void)sum; lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order, decoded + pred_order, coeffs); + #elif defined(CPU_ARM) && !defined(SIMULATOR) + (void)sum; + lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order, decoded + pred_order, coeffs); #else for (i = pred_order; i < s->blocksize; i++) { |