commit ed56e77acb1ca4524bf49d9cdec7d11a51f5134d
author Jean-Michel Trivi <jmtrivi@google.com> Tue Jan 15 18:46:27 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 15 18:46:27 2019 +0000
tree 0b81b293b560a0a5e4e4b481f2a330022f7ce91b
parent bcda185d5694ad9d3f28f919f8b03000510b4d63
parent e81e8c2cc0b978e986fcb59dfca0ebfcd4db2a8e

Merge "Do not support channel configuration change within PCE"

libAACdec/src/aacdecoder.cpp

diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp
index fffc1f0..8f03328 100644
--- a/libAACdec/src/aacdecoder.cpp
+++ b/libAACdec/src/aacdecoder.cpp
@@ -539,13 +539,7 @@
                     sizeof(CProgramConfig)); /* Store the complete PCE */
           pceStatus = 1; /* New PCE but no change of config */
           break;
-        case 2: /* The number of channels are identical but not the config */
-          if (channelConfig == 0) {
-            FDKmemcpy(pce, tmpPce,
-                      sizeof(CProgramConfig)); /* Store the complete PCE */
-            pceStatus = 2; /* Decoder needs re-configuration */
-          }
-          break;
+        case 2:  /* The number of channels are identical but not the config */
         case -1: /* The channel configuration is completely different */
           pceStatus = -1; /* Not supported! */
           break;