Revert "deinterlace/yadif: Disable x86 asm on Android"

This reverts commit 508e3db778.
7 years ago · 65b86d5bbc
2 changed files with 1 additions and 4 deletions
--- a/modules/video_filter/Makefile.am
+++ b/modules/video_filter/Makefile.am
@ -136,12 +136,9 @@ libdeinterlace_plugin_la_SOURCES = \
 	video_filter/deinterlace/algo_ivtc.c video_filter/deinterlace/algo_ivtc.h
 # inline ASM doesn't build with -O0
 libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) -O2
-# Disabled on Android due to text reloc issues
-if !HAVE_ANDROID
 if HAVE_X86ASM
 libdeinterlace_plugin_la_SOURCES += video_filter/deinterlace/yadif_x86.asm
 endif
-endif
 if HAVE_NEON
 libdeinterlace_plugin_la_SOURCES += video_filter/deinterlace/merge_arm.S
 libdeinterlace_plugin_la_CFLAGS += -DCAN_COMPILE_ARM
--- a/modules/video_filter/deinterlace/algo_yadif.c
+++ b/modules/video_filter/deinterlace/algo_yadif.c
@ -112,7 +112,7 @@ int RenderYadif( filter_t *p_filter, picture_t *p_dst, picture_t *p_src,
        void (*filter)(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next,
                       int w, int prefs, int mrefs, int parity, int mode);

-#if defined(HAVE_X86ASM) && !defined (__ANDROID__)
+#if defined(HAVE_X86ASM)
        if( vlc_CPU_SSSE3() )
            filter = vlcpriv_yadif_filter_line_ssse3;
        else