commit a44ef3e76a7108c24639e8bfdd3f59c0f4013878
author The Android Automerger <android-build@google.com> Tue Mar 29 21:53:09 2016 -0700
committer The Android Automerger <android-build@google.com> Tue Mar 29 21:53:09 2016 -0700
tree 510b410f66a888a5d517cacbac717cdfde055115
parent 2d435aa43323935bd8ed293f4f12cddfdee81eb3
parent feb44503a20c4bf6890984aae317faae41fb3e7f

merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev

libAACdec/src/aacdec_drc.cpp

diff --git a/libAACdec/src/aacdec_drc.cpp b/libAACdec/src/aacdec_drc.cpp
index 9cfc5d5..0c33a2b 100644
--- a/libAACdec/src/aacdec_drc.cpp
+++ b/libAACdec/src/aacdec_drc.cpp
@@ -2,7 +2,7 @@
 /* -----------------------------------------------------------------------------------------------------------
 Software License for The Fraunhofer FDK AAC Codec Library for Android
 
-© Copyright  1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
+© Copyright  1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
   All rights reserved.
 
  1.    INTRODUCTION
@@ -705,10 +705,6 @@
   }
   self->numPayloads = 0;
 
-  if (self->numThreads >= MAX_DRC_THREADS) {
-      self->numThreads = MAX_DRC_THREADS - 1;
-  }
-
   if (self->dvbAncDataAvailable)
   { /* Append a DVB heavy compression payload thread if available. */
     int bitsParsed;
@@ -735,10 +731,6 @@
 
   /* coupling channels not supported */
 
-  if (self->numThreads >= MAX_DRC_THREADS) {
-      self->numThreads = MAX_DRC_THREADS - 1;
-  }
-
   /* check for valid threads */
   for (thread = 0; thread < self->numThreads; thread++) {
     CDrcPayload *pThreadBs = &threadBs[thread];