kodi/xbmc-12.0-inconsistent_oper...

21 lines
763 B
Diff

--- xbmc-12.0/xbmc/cores/AudioEngine/Utils/AEConvert.cpp 2013-02-17 23:14:49.319795975 +0000
+++ xbmc-12.0/xbmc/cores/AudioEngine/Utils/AEConvert.cpp.asmfix 2013-02-17 22:55:36.089407599 +0000
@@ -155,7 +155,7 @@
{
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 @@
{
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__ (