diff options
| author | Eric Laurent <elaurent@google.com> | 2010-08-25 10:39:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 10:39:21 -0700 |
| commit | dd8b35d2f7911bb1e12010f143c5b8c1b621f2ed (patch) | |
| tree | e77993106962eabf522259f9a23a0a421b1a5118 /media/libmedia | |
| parent | b00a1e3f7e415c72b6ff6d2073b5b78c0d39e0ee (diff) | |
| parent | 625981ec8417528cbea67c86dcbe32a9e79a79be (diff) | |
| download | frameworks_av-dd8b35d2f7911bb1e12010f143c5b8c1b621f2ed.zip frameworks_av-dd8b35d2f7911bb1e12010f143c5b8c1b621f2ed.tar.gz frameworks_av-dd8b35d2f7911bb1e12010f143c5b8c1b621f2ed.tar.bz2 | |
am 67b50606: Merge "Fix the simulator build." into gingerbread
Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp
* commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9':
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) |