aboutsummaryrefslogtreecommitdiffstats
path: root/distrib/jpeg-6b/jmorecfg.h
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2012-11-18 15:47:18 -0800
committerSteve Kondik <shade@chemlab.org>2012-11-18 15:47:18 -0800
commita546c7006355a7bd1df4267ee53d0bfa2c017c8c (patch)
tree01be0bf6c0d6968e1468ec9661fd52110f9b05a7 /distrib/jpeg-6b/jmorecfg.h
parentbaf3d7830396202df5cc47bd7bcee109c319cdb3 (diff)
parent0f809250987b64f491bd3b4b73c0f0d33036a786 (diff)
downloadexternal_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.zip
external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.tar.gz
external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.tar.bz2
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/qemu into mr1-staging
Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115
Diffstat (limited to 'distrib/jpeg-6b/jmorecfg.h')
-rw-r--r--distrib/jpeg-6b/jmorecfg.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/distrib/jpeg-6b/jmorecfg.h b/distrib/jpeg-6b/jmorecfg.h
index 9dfde01..95df28b 100644
--- a/distrib/jpeg-6b/jmorecfg.h
+++ b/distrib/jpeg-6b/jmorecfg.h
@@ -366,8 +366,12 @@ typedef int boolean;
*/
#ifndef MULTIPLIER
+#ifdef ANDROID_INTELSSE2_IDCT
+ #define MULTIPLIER short
+#else
#define MULTIPLIER int /* type for fastest integer multiply */
#endif
+#endif
/* FAST_FLOAT should be either float or double, whichever is done faster