commit 3be49fd8fe11c366a0ef9500dd1c43052ca777ad
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Feb 02 14:55:34 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 02 14:55:34 2018 +0000
tree 57451030abf3be4b2ae2a091bbcc0c05502c2090
parent 9f487b9566425d2be002d85cc4ced8127fcb6734
parent 9ab6f29ae0e9ae2250c2fd600ea3194300b9e97e

[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c am: bb38f901b4 am: e12ed0c4fb am: 27e0af2ad1
am: 9ab6f29ae0  -s ours

Change-Id: I79afffd974b455d192aa1259514ac8c0d8f48202

libFDK/include/fixpoint_math.h

diff --git a/libFDK/include/fixpoint_math.h b/libFDK/include/fixpoint_math.h
index 6aa0a90..0d50f0a 100644
--- a/libFDK/include/fixpoint_math.h
+++ b/libFDK/include/fixpoint_math.h
@@ -479,19 +479,15 @@
 
 /**
  * \brief Calculate the value of 1/i where i is a integer value. It supports
- *        input values from 0 upto 79.
+ *        input values from 1 upto 80.
  * \param intValue Integer input value.
  * \param FIXP_DBL representation of 1/intValue
  */
 inline FIXP_DBL GetInvInt(int intValue)
 {
-  FDK_ASSERT((intValue >= 0) && (intValue < 80));
-  if (intValue > 79)
-    return invCount[79];
-  else if (intValue < 0)
-    return invCount[0];
-  else
-    return invCount[intValue];
+  FDK_ASSERT((intValue > 0) && (intValue < 80));
+  FDK_ASSERT(intValue<80);
+	return invCount[intValue];
 }