From ab6b2246755ccde6676f51bbc7ac185a25a11f46 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Thu, 30 Apr 2015 18:21:19 +0000 Subject: [PATCH] fix for arm builds where tmp for assembly produces an error if its uninitialized. BUG=libyuv:432 TESTED=try bots R=tpsiaki@google.com Review URL: https://webrtc-codereview.appspot.com/49249004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1392 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/scale_neon.cc | 2 +- source/scale_neon64.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.chromium b/README.chromium index 31abeb084..7e7070e80 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1382 +Version: 1392 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index bef482b14..b4ee9901c 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1382 +#define LIBYUV_VERSION 1392 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/scale_neon.cc b/source/scale_neon.cc index 78501811c..7825878e9 100644 --- a/source/scale_neon.cc +++ b/source/scale_neon.cc @@ -927,7 +927,7 @@ void ScaleARGBRowDownEvenBox_NEON(const uint8* src_argb, ptrdiff_t src_stride, void ScaleARGBCols_NEON(uint8* dst_argb, const uint8* src_argb, int dst_width, int x, int dx) { - int tmp; + int tmp = 0; const uint8* src_tmp = src_argb; asm volatile ( ".p2align 2 \n" diff --git a/source/scale_neon64.cc b/source/scale_neon64.cc index 47085ccf6..cd07f4a56 100644 --- a/source/scale_neon64.cc +++ b/source/scale_neon64.cc @@ -931,7 +931,7 @@ void ScaleARGBCols_NEON(uint8* dst_argb, const uint8* src_argb, int64 dst_width64 = (int64) dst_width; // Work around ios 64 bit warning. int64 x64 = (int64) x; int64 dx64 = (int64) dx; - int64 tmp64; + int64 tmp64 = 0; asm volatile ( "1: \n" LOAD1_DATA32_LANE(v0, 0)