Merge commit 'bbf71d46db3417b43bcbd745cbf235e8e2ff69ae'

[ffmpeg] / libavcodec / aacenc_utils.h

diff --git a/libavcodec/aacenc_utils.h b/libavcodec/aacenc_utils.h
index 0ab15a3e5e87de139ed2c56e5d8cf3c81092b6c5..dbc95543791ee2f0fe6e9a673194324682082632 100644 (file)
--- a/libavcodec/aacenc_utils.h
+++ b/libavcodec/aacenc_utils.h
@@ -89,13 +89,10 @@ static inline int find_min_book(float maxval, int sf)
     float Q34 = sqrtf(Q * sqrtf(Q));
     int qmaxval, cb;
     qmaxval = maxval * Q34 + C_QUANT;
-    if      (qmaxval ==  0) cb = 0;
-    else if (qmaxval ==  1) cb = 1;
-    else if (qmaxval ==  2) cb = 3;
-    else if (qmaxval <=  4) cb = 5;
-    else if (qmaxval <=  7) cb = 7;
-    else if (qmaxval <= 12) cb = 9;
-    else                    cb = 11;
+    if (qmaxval >= (FF_ARRAY_ELEMS(aac_maxval_cb)))
+        cb = 11;
+    else
+        cb = aac_maxval_cb[qmaxval];
     return cb;
 }