diff options
| author | Eric Laurent <elaurent@google.com> | 2010-08-25 10:41:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 10:41:55 -0700 |
| commit | e7c0899a7b7549ea342af67e7ab525f81672cfa5 (patch) | |
| tree | cad1c4a45254d4261f17c2ca71faea19b14b4fd9 /media/libmedia | |
| parent | 17c53d433cd83d6b7d77e80635d6d58e2f6f5b2e (diff) | |
| parent | dd8b35d2f7911bb1e12010f143c5b8c1b621f2ed (diff) | |
| download | frameworks_av-e7c0899a7b7549ea342af67e7ab525f81672cfa5.zip frameworks_av-e7c0899a7b7549ea342af67e7ab525f81672cfa5.tar.gz frameworks_av-e7c0899a7b7549ea342af67e7ab525f81672cfa5.tar.bz2 | |
am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread
Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64'
* commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64':
Fix the simulator build.
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/fixedfft.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmedia/fixedfft.cpp b/media/libmedia/fixedfft.cpp index 28eb05a..9cf05ba 100644 --- a/media/libmedia/fixedfft.cpp +++ b/media/libmedia/fixedfft.cpp @@ -26,7 +26,9 @@ #include <stdio.h> #include <stdint.h> +#ifdef __ARM_ARCH__ #include <machine/cpu-features.h> +#endif #define LOG_FFT_SIZE 10 #define MAX_FFT_SIZE (1 << LOG_FFT_SIZE) |