ALIGNP test if ALIGNP is already defined to avoid a redefine. Allows new ALIGNP to coexist with old libjingle version of ALIGNP when integrating into chromium.

BUG=104
TEST=build chromium against libyuv
Review URL: https://webrtc-codereview.appspot.com/857004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@381 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 380
+Version: 381
 License: BSD
 License File: LICENSE
 

include/libyuv/basic_types.h

@@ -70,9 +70,11 @@ typedef signed char int8;
 #define CPU_ARM 1
 #endif
 
+#ifndef ALIGNP
 #define ALIGNP(p, t) \
     (reinterpret_cast<uint8*>(((reinterpret_cast<uintptr_t>(p) + \
     ((t) - 1)) & ~((t) - 1))))
+#endif
 
 #if !defined(LIBYUV_API)
 #if defined(_WIN32) || defined(__CYGWIN__)

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 380
+#define LIBYUV_VERSION 381
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT