commit cd55b7c1db322760c5282a305d4abdf4acfa9697
author Linux Build Service Account <lnxbuild@localhost> Sat Aug 02 14:08:48 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Aug 02 14:08:48 2014 -0700
tree 596d5672c22f2d968f43b56b9c68d12929a214eb
parent 1f011334508346d88938e746a1a6ac4cf1d4cdbf
parent 5cc90ddef83b529fe0ff85467913907e3ba67f23

Merge "copybit: Avoid NEON instructions in s/w converter on 64bit"

libcopybit/software_converter.cpp

diff --git a/libcopybit/software_converter.cpp b/libcopybit/software_converter.cpp
index 71e685e..9ea8767 100644
--- a/libcopybit/software_converter.cpp
+++ b/libcopybit/software_converter.cpp
@@ -60,7 +60,7 @@
     unsigned char* oldChroma = (unsigned char*)(hnd->base + y_size);
     memcpy((char *)yv12_handle->base,(char *)hnd->base,y_size);
 
-#ifdef __ARM_HAVE_NEON
+#if defined(__ARM_HAVE_NEON) && !defined(__aarch64__)
    /* interleave */
     if(!chromaPadding) {
         unsigned char * t1 = newChroma;