Commit 7c465631 authored by fbarchard@google.com's avatar fbarchard@google.com

cpuid on nonx86 has an unused parameter.

BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/814004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@363 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 7781d943
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 362
Version: 363
License: BSD
License File: LICENSE
......
......@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 362
#define LIBYUV_VERSION 363
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
......@@ -47,14 +47,16 @@ extern "C" {
#endif
// Low level cpuid for X86. Returns zeros on other CPUs.
void CpuId(int cpu_info[4], int info_type) {
#if !defined(__CLR_VER) && (defined(_M_IX86) || defined(_M_X64) || \
defined(__i386__) || defined(__x86_64__))
void CpuId(int cpu_info[4], int info_type) {
__cpuid(cpu_info, info_type);
}
#else
void CpuId(int cpu_info[4], int) {
cpu_info[0] = cpu_info[1] = cpu_info[2] = cpu_info[3] = 0;
#endif
}
#endif
// based on libvpx arm_cpudetect.c
// For Arm, but public to allow testing on any CPU
......
......@@ -702,6 +702,7 @@ TEST_F(libyuvTest, TestARGBColorMatrix) {
TEST_F(libyuvTest, TestARGBColorTable) {
SIMD_ALIGNED(uint8 orig_pixels[256][4]);
memset(orig_pixels, 0, sizeof(orig_pixels));
// Matrix for Sepia.
static const uint8 kARGBTable[256 * 4] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment