From 48f5dd39b83f226b94ab4204f3186e8a39d87395 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Sat, 18 Feb 2012 00:19:06 +0000 Subject: [PATCH] fix ifdef mismatch Review URL: https://webrtc-codereview.appspot.com/391016 git-svn-id: http://libyuv.googlecode.com/svn/trunk@179 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/row_posix.cc | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/README.chromium b/README.chromium index e4d057ad6..d6f51ab00 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 178 +Version: 179 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 832224dd1..ca0952fa3 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,7 +11,7 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 178 +#define LIBYUV_VERSION 179 #endif // INCLUDE_LIBYUV_VERSION_H_ diff --git a/source/row_posix.cc b/source/row_posix.cc index 249ef8e29..de9a954d7 100644 --- a/source/row_posix.cc +++ b/source/row_posix.cc @@ -803,7 +803,6 @@ void ARGBToUVRow_Unaligned_SSSE3(const uint8* src_argb0, int src_stride_argb, ); } - void BGRAToYRow_SSSE3(const uint8* src_bgra, uint8* dst_y, int pix) { asm volatile ( "movdqa %4,%%xmm5 \n" @@ -1007,8 +1006,6 @@ void BGRAToUVRow_Unaligned_SSSE3(const uint8* src_bgra0, int src_stride_bgra, #endif ); } -#endif - void ABGRToYRow_SSSE3(const uint8* src_abgr, uint8* dst_y, int pix) { asm volatile ( @@ -1213,7 +1210,6 @@ void ABGRToUVRow_Unaligned_SSSE3(const uint8* src_abgr0, int src_stride_abgr, #endif ); } -#endif #endif // HAS_ARGBTOYROW_SSSE3