summaryrefslogtreecommitdiffstats
path: root/host/lib/convert
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2012-04-21 11:09:58 -0700
committerJosh Blum <josh@joshknows.com>2012-04-21 11:09:58 -0700
commit4378ad458441e1431ea3bdaafd8d663d3061f6f3 (patch)
tree75dc6a1b06e80c051f39ce101b72c2c10b0e1b54 /host/lib/convert
parentf84d7579aecaf2a90965331b200f6b298cd0c1d4 (diff)
parent81e2262c9e41bbd3621c9753231e5eba23cd7292 (diff)
downloaduhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.tar.gz
uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.tar.bz2
uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.zip
Merge branch 'master' into next
Diffstat (limited to 'host/lib/convert')
-rw-r--r--host/lib/convert/convert_common.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/convert/convert_common.hpp b/host/lib/convert/convert_common.hpp
index 55bc2e99d..29ea94870 100644
--- a/host/lib/convert/convert_common.hpp
+++ b/host/lib/convert/convert_common.hpp
@@ -57,8 +57,8 @@ static const int PRIORITY_SIMD = 1; //neon conversions could be implemented bett
static const int PRIORITY_TABLE = 2; //tables require large cache, so they are slower on arm
#else
static const int PRIORITY_LIBORC = 1;
-static const int PRIORITY_SIMD = 2;
-static const int PRIORITY_TABLE = 3;
+static const int PRIORITY_SIMD = 3;
+static const int PRIORITY_TABLE = 2;
#endif
/***********************************************************************