From 4d2cfd329aabe658aedc5bfb0e1e17fb21c08399 Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Mon, 25 Jun 2012 20:09:31 +0000
Subject: [PATCH] Change name of variable for mac because static cant be used
 so variables need to be unique. BUG=none TEST=none Review URL:
 https://webrtc-codereview.appspot.com/672006

git-svn-id: http://libyuv.googlecode.com/svn/trunk@293 16f28f9a-4ce2-e073-06de-1de4eb20be90
---
 README.chromium          | 2 +-
 include/libyuv/version.h | 2 +-
 source/row_posix.cc      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.chromium b/README.chromium
index cf6060b75..ed4395f77 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 292
+Version: 293
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 36aeb2601..34bc1da8c 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 292
+#define LIBYUV_VERSION 293
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
 
diff --git a/source/row_posix.cc b/source/row_posix.cc
index 632a30c1f..aa24149ca 100644
--- a/source/row_posix.cc
+++ b/source/row_posix.cc
@@ -1968,7 +1968,7 @@ void MirrorRowUV_SSSE3(const uint8* src, uint8* dst_u, uint8* dst_v,
     "+r"(dst_u),    // %1
     "+r"(dst_v),    // %2
     "+r"(temp_width)  // %3
-  : "m"(kShuffleMirrorUV) // %4
+  : "m"(kShuffleMirrorUV)  // %4
   : "memory", "cc"
 #if defined(__SSE2__)
     , "xmm0", "xmm1"
@@ -1979,7 +1979,7 @@ void MirrorRowUV_SSSE3(const uint8* src, uint8* dst_u, uint8* dst_v,
 
 #ifdef HAS_ARGBMIRRORROW_SSSE3
 // Shuffle table for reversing the bytes.
-CONST uvec8 kShuffleMirror = {
+CONST uvec8 kARGBShuffleMirror = {
   12u, 13u, 14u, 15u, 8u, 9u, 10u, 11u, 4u, 5u, 6u, 7u, 0u, 1u, 2u, 3u
 };
 
@@ -1999,7 +1999,7 @@ void ARGBMirrorRow_SSSE3(const uint8* src, uint8* dst, int width) {
   : "+r"(src),  // %0
     "+r"(dst),  // %1
     "+r"(temp_width)  // %2
-  : "m"(kShuffleMirror) // %3
+  : "m"(kARGBShuffleMirror)  // %3
   : "memory", "cc"
 #if defined(__SSE2__)
     , "xmm0", "xmm5"