| Index: media/base/yuv_convert.cc
|
| diff --git a/media/base/yuv_convert.cc b/media/base/yuv_convert.cc
|
| index f6e28576054fc93c40e8ca77d2730b1d2a9c86e9..2e4af1d21c2a0bd8609d10fa934247dfe59a9551 100644
|
| --- a/media/base/yuv_convert.cc
|
| +++ b/media/base/yuv_convert.cc
|
| @@ -17,6 +17,7 @@
|
|
|
| #include "media/base/yuv_convert.h"
|
|
|
| +#include "build/build_config.h"
|
| #include "media/base/cpu_features.h"
|
| #include "media/base/yuv_convert_internal.h"
|
| #include "media/base/yuv_row.h"
|
| @@ -356,7 +357,7 @@ void ConvertRGB32ToYUV(const uint8* rgbframe,
|
| static void (*convert_proc)(const uint8*, uint8*, uint8*, uint8*,
|
| int, int, int, int, int) = NULL;
|
| if (!convert_proc) {
|
| -#ifdef __arm__
|
| +#if defined(ARCH_CPU_ARM_FAMILY)
|
| // For ARM processors, always use C version.
|
| // TODO(hclam): Implement a NEON version.
|
| convert_proc = &ConvertRGB32ToYUV_C;
|
|
|