Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[arm] fixed, build under -mcpu=arm1176jzf-s -mfloat-abi=softfp

  • Loading branch information...
commit bc772968ebaa98d37a0baa5d820d7b8abb57a8f3 1 parent c468689
@davilla davilla authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 xbmc/cores/AudioEngine/Utils/AEConvert.cpp
View
4 xbmc/cores/AudioEngine/Utils/AEConvert.cpp
@@ -155,7 +155,7 @@ unsigned int CAEConvert::S16LE_Float(uint8_t* data, const unsigned int samples,
{
static const float mul = 1.0f / (INT16_MAX + 0.5f);
-#if defined(__ARM_NEON__) || defined(__VFP_FP__)
+#if defined(__ARM_NEON__) || (defined(__VFP_FP__) && !defined(__SOFTFP__))
for (unsigned int i = 0; i < samples; i++)
{
__asm__ __volatile__ (
@@ -186,7 +186,7 @@ unsigned int CAEConvert::S16BE_Float(uint8_t* data, const unsigned int samples,
{
static const float mul = 1.0f / (INT16_MAX + 0.5f);
-#if defined(__ARM_NEON__) || defined(__VFP_FP__)
+#if defined(__ARM_NEON__) || (defined(__VFP_FP__) && !defined(__SOFTFP__))
for (unsigned int i = 0; i < samples; i++)
{
__asm__ __volatile__ (
Please sign in to comment.
Something went wrong with that request. Please try again.