[vlc-commits] deinterlace: fix ARM linking with --disable-neon

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Aug  8 00:08:21 2012 +0300| [b10bc3672b48b4d639c25dc511840a8f97ca7db9] | committer: Rémi Denis-Courmont

deinterlace: fix ARM linking with --disable-neon

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

 modules/video_filter/Modules.am                |    7 ++++---
 modules/video_filter/deinterlace/deinterlace.c |    2 +-
 modules/video_filter/deinterlace/merge.h       |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 1301123..0585d6f 100644
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -28,12 +28,13 @@ libdeinterlace_plugin_la_SOURCES = \
 	deinterlace/yadif.h deinterlace/yadif_template.h \
 	deinterlace/algo_phosphor.c deinterlace/algo_phosphor.h \
 	deinterlace/algo_ivtc.c deinterlace/algo_ivtc.h
-if HAVE_NEON
-libdeinterlace_plugin_la_SOURCES += deinterlace/merge_arm.S
-endif
 libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdeinterlace_plugin_la_LIBADD = $(AM_LIBADD)
 libdeinterlace_plugin_la_DEPENDENCIES =
+if HAVE_NEON
+libdeinterlace_plugin_la_SOURCES += deinterlace/merge_arm.S
+libdeinterlace_plugin_la_CFLAGS += -DCAN_COMPILE_ARM
+endif
 libvlc_LTLIBRARIES += libdeinterlace_plugin.la
 
 libosdmenu_plugin_la_SOURCES = osdmenu.c
diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c
index 4cfb86a..25c58eb 100644
--- a/modules/video_filter/deinterlace/deinterlace.c
+++ b/modules/video_filter/deinterlace/deinterlace.c
@@ -656,7 +656,7 @@ int Open( vlc_object_t *p_this )
     }
     else
 #endif
-#if defined(__arm__)
+#if defined(CAN_COMPILE_ARM)
     if( vlc_CPU_ARM_NEON() )
         p_sys->pf_merge =
             (chroma->pixel_size == 1) ? merge8_arm_neon : merge16_arm_neon;
diff --git a/modules/video_filter/deinterlace/merge.h b/modules/video_filter/deinterlace/merge.h
index ca0c61c..066102e 100644
--- a/modules/video_filter/deinterlace/merge.h
+++ b/modules/video_filter/deinterlace/merge.h
@@ -158,7 +158,7 @@ void Merge8BitSSE2( void *, const void *, const void *, size_t );
 void Merge16BitSSE2( void *, const void *, const void *, size_t );
 #endif
 
-#ifdef __arm__
+#if defined(CAN_COMPILE_ARM)
 /**
  * ARM NEON routine to blend pixels from two picture lines.
  */