commit 5c37b577ee5af800f8d4cc0cff08549f156fcbff
author Jean-Michel Trivi <jmtrivi@google.com> Thu Feb 01 00:49:21 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 01 00:49:21 2018 +0000
tree 57451030abf3be4b2ae2a091bbcc0c05502c2090
parent d9d9c95b481054be4cc0c934d1a9dfa6f1c8d865
parent 78d566fc192426982629bbb82005dc8f6904d3f0

DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 8415da3381 am: 8765ef76ef am: e9b6807818
am: 78d566fc19  -s ours

Change-Id: Iebff381e12ca0f86c9cb22c856b4c7be3c3a5581

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];
 }