commit abd1881db9cd61f13375c760b7fdae9219729c47
author Colin Cross <ccross@android.com> Tue Sep 22 22:22:20 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 22 22:22:20 2015 +0000
tree 3c98e2e95d10082ec818324192be65728c7c5554
parent 4ec72fb10684276b048d5b3a6ba7a88d43b06411
parent ceb214959c6af1945c48599feb0e6b8e4e42c1e0

am ceb21495: Merge "Fix libvpx clang build"

* commit 'ceb214959c6af1945c48599feb0e6b8e4e42c1e0':
  Fix libvpx clang build

armv7a-neon/vp8_rtcd.h

diff --git a/armv7a-neon/vp8_rtcd.h b/armv7a-neon/vp8_rtcd.h
index 77b0e47..66ad28a 100644
--- a/armv7a-neon/vp8_rtcd.h
+++ b/armv7a-neon/vp8_rtcd.h
@@ -33,8 +33,7 @@
 
 void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 void vp8_bilinear_predict4x4_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-#define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_neon
+#define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_armv6
 
 void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 void vp8_bilinear_predict8x4_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);

libvpx/vp8/common/rtcd_defs.pl

diff --git a/libvpx/vp8/common/rtcd_defs.pl b/libvpx/vp8/common/rtcd_defs.pl
index fd9afd2..4aa0e0c 100644
--- a/libvpx/vp8/common/rtcd_defs.pl
+++ b/libvpx/vp8/common/rtcd_defs.pl
@@ -238,7 +238,7 @@
 $vp8_bilinear_predict8x4_media=vp8_bilinear_predict8x4_armv6;
 
 add_proto qw/void vp8_bilinear_predict4x4/, "unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch";
-specialize qw/vp8_bilinear_predict4x4 mmx media neon/;
+specialize qw/vp8_bilinear_predict4x4 mmx media/;
 $vp8_bilinear_predict4x4_media=vp8_bilinear_predict4x4_armv6;
 
 #

libwebm/mkvparser.cpp

diff --git a/libwebm/mkvparser.cpp b/libwebm/mkvparser.cpp
index f7a34c1..7501b9f 100644
--- a/libwebm/mkvparser.cpp
+++ b/libwebm/mkvparser.cpp
@@ -4133,7 +4133,7 @@
       long long val;
       status = UnserializeInt(pReader, pos, size, val);
 
-      if (val < 0)  // error
+      if (status < 0)  // error
         return status;
 
       m_uid = static_cast<unsigned long long>(val);