| Index: source/libvpx/third_party/libyuv/source/format_conversion.cc
|
| ===================================================================
|
| --- source/libvpx/third_party/libyuv/source/format_conversion.cc (revision 291857)
|
| +++ source/libvpx/third_party/libyuv/source/format_conversion.cc (working copy)
|
| @@ -332,11 +332,13 @@
|
| if (IS_ALIGNED(width, 8)) {
|
| ARGBToYRow = ARGBToYRow_NEON;
|
| }
|
| - if (width >= 16) {
|
| - ARGBToUVRow = ARGBToUVRow_Any_NEON;
|
| - if (IS_ALIGNED(width, 16)) {
|
| - ARGBToUVRow = ARGBToUVRow_NEON;
|
| - }
|
| + }
|
| +#endif
|
| +#if defined(HAS_ARGBTOUVROW_NEON)
|
| + if (TestCpuFlag(kCpuHasNEON) && width >= 16) {
|
| + ARGBToUVRow = ARGBToUVRow_Any_NEON;
|
| + if (IS_ALIGNED(width, 16)) {
|
| + ARGBToUVRow = ARGBToUVRow_NEON;
|
| }
|
| }
|
| #endif
|
|
|