From c7bd1dbea68245297831d4f3e187405db20d4101 Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Wed, 9 May 2012 21:55:02 +0000
Subject: [PATCH] remove extra lea on gcc libyuv scale BUG=none TEST=none
 Review URL: https://webrtc-codereview.appspot.com/562007

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

diff --git a/README.chromium b/README.chromium
index 85372c79d..d4bfff4fd 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 261
+Version: 263
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/cpu_id.h b/include/libyuv/cpu_id.h
index e0235f7c2..cfa9ec15a 100644
--- a/include/libyuv/cpu_id.h
+++ b/include/libyuv/cpu_id.h
@@ -30,7 +30,7 @@ static const int kCpuHasNEON = 32;
 static const int kCpuInitialized = 64;
 
 // Detect CPU has SSE2 etc.
-// test_flag parameter should be one of kCpuHas constants above
+// Test_flag parameter should be one of kCpuHas constants above.
 // returns non-zero if instruction set is detected
 static __inline int TestCpuFlag(int test_flag) {
   extern int cpu_info_;
@@ -41,8 +41,7 @@ static __inline int TestCpuFlag(int test_flag) {
 // For testing, allow CPU flags to be disabled.
 // ie MaskCpuFlags(~kCpuHasSSSE3) to disable SSSE3.
 // MaskCpuFlags(-1) to enable all cpu specific optimizations.
-// MaskCpuFlags(kCpuInitialized) to disable all cpu specific optimizations.
-// MaskCpuFlags(0) to re-initialize all cpu detection.
+// MaskCpuFlags(0) to disable all cpu specific optimizations.
 void MaskCpuFlags(int enable_flags);
 
 // Low level cpuid for X86.  Returns zeros on other CPUs.
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 07f36c327..7b18027aa 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 261
+#define LIBYUV_VERSION 263
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
 
diff --git a/source/scale.cc b/source/scale.cc
index 235bcf8f2..35e89311c 100644
--- a/source/scale.cc
+++ b/source/scale.cc
@@ -1972,7 +1972,6 @@ static void ScaleFilterRows_SSE2(uint8* dst_ptr,
     "sub       $0x10,%2                        \n"
     "movdqa    %%xmm0,(%1,%0,1)                \n"
     "lea       0x10(%1),%1                     \n"
-    "lea       0x10(%1),%1                     \n"
     "jg        3b                              \n"
     ".p2align  4                               \n"
   "4:                                          \n"
diff --git a/source/scale_argb.cc b/source/scale_argb.cc
index 50ba89bce..3d19dae24 100644
--- a/source/scale_argb.cc
+++ b/source/scale_argb.cc
@@ -720,7 +720,6 @@ static void ScaleARGBDown2(int src_width, int src_height,
   }
 }
 
-
 /**
  * ScaleARGB ARGB Even
  *