commit bdea4742b78da423da73cd40be8398841d004094
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Feb 02 14:55:56 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 02 14:55:56 2018 +0000
tree 57451030abf3be4b2ae2a091bbcc0c05502c2090
parent d8828f34500e942d2004cca1f08f9a061a308cf7
parent 88d43f631a9bd75fde2948ffb737b20bc18228bd

[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d am: dcbb54a6ec am: 67e9a995ce am: fec52a666d
am: 88d43f631a  -s ours

Change-Id: Idf901fae7d4b3a6ebfdf43c4a078ea81635b44de

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