From b74ed8076a98b6bc2a4064eecfe32e8f80a56c47 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 18 Dec 2013 19:50:00 +0000 Subject: [PATCH] Add ifdef for scale functions on dsp2 BUG=none TEST=none R=tpsiaki@google.com Review URL: https://webrtc-codereview.appspot.com/6159004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@919 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/scale_row.h | 2 +- include/libyuv/version.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 089fe3884..c919577c4 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 918 +Version: 919 License: BSD License File: LICENSE diff --git a/include/libyuv/scale_row.h b/include/libyuv/scale_row.h index 23c4e9079..8e1abfa1c 100644 --- a/include/libyuv/scale_row.h +++ b/include/libyuv/scale_row.h @@ -48,7 +48,7 @@ extern "C" { // The following are available on Mips platforms: #if !defined(LIBYUV_DISABLE_MIPS) && !defined(__native_client__) && \ - defined(__mips__) + defined(__mips__) && defined(__mips_dsp) && (__mips_dsp_rev >= 2) #define HAS_SCALEROWDOWN2_MIPS_DSPR2 #define HAS_SCALEROWDOWN4_MIPS_DSPR2 #define HAS_SCALEROWDOWN34_MIPS_DSPR2 diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 5b7d65d8c..4e6d0c757 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 918 +#define LIBYUV_VERSION 919 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT