Merge commit 'e2710e790c09e49e86baa58c6063af0097cc8cb0'

[ffmpeg] / libavfilter / x86 / vf_maskedmerge_init.c

diff --git a/libavfilter/x86/vf_maskedmerge_init.c b/libavfilter/x86/vf_maskedmerge_init.c
index 443570047ba4b42208a744ff59acf1d741a38541..73ab8880833fd7b8145c9234a02e9c52f791694f 100644 (file)
--- a/libavfilter/x86/vf_maskedmerge_init.c
+++ b/libavfilter/x86/vf_maskedmerge_init.c
@@ -34,7 +34,7 @@ av_cold void ff_maskedmerge_init_x86(MaskedMergeContext *s)
 {
     int cpu_flags = av_get_cpu_flags();
 
-    if (ARCH_X86_64 && EXTERNAL_SSE2(cpu_flags) && s->depth == 8) {
+    if (EXTERNAL_SSE2(cpu_flags) && s->depth == 8) {
         s->maskedmerge = ff_maskedmerge8_sse2;
     }
 }