[vlc-commits] audio_filter: simple: rename CAN_COMPILE_ARM define

Thomas Guillem git at videolan.org
Thu May 17 17:31:30 CEST 2018


vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu May 17 11:49:39 2018 +0200| [6dc3c76bcfeb27a34bd20171da62cc5b8b70f555] | committer: Thomas Guillem

audio_filter: simple: rename CAN_COMPILE_ARM define

Since it's used only for the neon case.

(cherry picked from commit 0349408931244c9788644f88fe33354a71b0f869)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=6dc3c76bcfeb27a34bd20171da62cc5b8b70f555
---

 modules/audio_filter/Makefile.am            | 2 +-
 modules/audio_filter/channel_mixer/simple.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/audio_filter/Makefile.am b/modules/audio_filter/Makefile.am
index e7c38cf8db..2611aa39cc 100644
--- a/modules/audio_filter/Makefile.am
+++ b/modules/audio_filter/Makefile.am
@@ -69,7 +69,7 @@ EXTRA_LTLIBRARIES += libsimple_channel_mixer_plugin_arm_neon.la
 libsimple_channel_mixer_plugin_arm_neon_la_SOURCES = arm_neon/simple_channel_mixer.S
 
 libsimple_channel_mixer_plugin_la_LIBADD += libsimple_channel_mixer_plugin_arm_neon.la
-libsimple_channel_mixer_plugin_la_CFLAGS += -DCAN_COMPILE_ARM
+libsimple_channel_mixer_plugin_la_CFLAGS += -DCAN_COMPILE_NEON
 endif
 
 audio_filter_LTLIBRARIES += \
diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index f9faed46ce..fb37a528f8 100644
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -258,7 +258,7 @@ static void DoWork_6_1_to_5_x( filter_t * p_filter,  block_t * p_in_buf, block_t
     }
 }
 
-#if defined (CAN_COMPILE_ARM)
+#if defined (CAN_COMPILE_NEON)
 #include "simple_neon.h"
 #define GET_WORK(in, out) GET_WORK_##in##_to_##out##_neon()
 #else



More information about the vlc-commits mailing list