Commit 37328ac2 authored Apr 05, 2016 by Robert Shih Committed by android-build-merger Apr 05, 2016

Merge "WebmWriter: avoid overflow when bit twiddling" into nyc-dev am: 1bb5062a

am: d997a4f3

* commit 'd997a4f3':
  WebmWriter: avoid overflow when bit twiddling

Change-Id: I2ee7cb219d07d11fce247d44e4dd0cf2d10dd82d

media/libstagefright/webm/EbmlUtil.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,9 @@ int NTZ_TABLE[] = {
		};

		int numberOfTrailingZeros32(int32_t i) {
		uint32_t u = (i & -i) * 0x0450FBAF;
		int64_t i64 = i;
		i64 = (i64 & -i64) * 0x0450FBAF;
		uint32_t u = i64;
		return NTZ_TABLE[(u) >> 26];
		}