| Index: source/convert_from.cc
|
| diff --git a/source/convert_from.cc b/source/convert_from.cc
|
| index adce529945bba393aaffd14c3ae4b8e3b441df98..3bc9eb1be4536bc54c16a04c80e3a8a5b3f758ba 100644
|
| --- a/source/convert_from.cc
|
| +++ b/source/convert_from.cc
|
| @@ -498,13 +498,13 @@ static int I420ToRGBAMatrix(const uint8* src_y, int src_stride_y,
|
| }
|
| }
|
| #endif
|
| -#if defined(HAS_I422TORGBAROW_MIPS_DSPR2)
|
| - if (TestCpuFlag(kCpuHasMIPS_DSPR2) && IS_ALIGNED(width, 4) &&
|
| +#if defined(HAS_I422TORGBAROW_DSPR2)
|
| + if (TestCpuFlag(kCpuHasDSPR2) && IS_ALIGNED(width, 4) &&
|
| IS_ALIGNED(src_y, 4) && IS_ALIGNED(src_stride_y, 4) &&
|
| IS_ALIGNED(src_u, 2) && IS_ALIGNED(src_stride_u, 2) &&
|
| IS_ALIGNED(src_v, 2) && IS_ALIGNED(src_stride_v, 2) &&
|
| IS_ALIGNED(dst_rgba, 4) && IS_ALIGNED(dst_stride_rgba, 4)) {
|
| - I422ToRGBARow = I422ToRGBARow_MIPS_DSPR2;
|
| + I422ToRGBARow = I422ToRGBARow_DSPR2;
|
| }
|
| #endif
|
|
|
| @@ -888,12 +888,12 @@ int I420ToRGB565Dither(const uint8* src_y, int src_stride_y,
|
| }
|
| }
|
| #endif
|
| -#if defined(HAS_I422TOARGBROW_MIPS_DSPR2)
|
| - if (TestCpuFlag(kCpuHasMIPS_DSPR2) && IS_ALIGNED(width, 4) &&
|
| +#if defined(HAS_I422TOARGBROW_DSPR2)
|
| + if (TestCpuFlag(kCpuHasDSPR2) && IS_ALIGNED(width, 4) &&
|
| IS_ALIGNED(src_y, 4) && IS_ALIGNED(src_stride_y, 4) &&
|
| IS_ALIGNED(src_u, 2) && IS_ALIGNED(src_stride_u, 2) &&
|
| IS_ALIGNED(src_v, 2) && IS_ALIGNED(src_stride_v, 2)) {
|
| - I422ToARGBRow = I422ToARGBRow_MIPS_DSPR2;
|
| + I422ToARGBRow = I422ToARGBRow_DSPR2;
|
| }
|
| #endif
|
| #if defined(HAS_ARGBTORGB565DITHERROW_SSE2)
|
|
|