diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2019-01-15 18:46:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-15 18:46:27 +0000 |
| commit | ed56e77acb1ca4524bf49d9cdec7d11a51f5134d (patch) | |
| tree | 0b81b293b560a0a5e4e4b481f2a330022f7ce91b | |
| parent | bcda185d5694ad9d3f28f919f8b03000510b4d63 (diff) | |
| parent | e81e8c2cc0b978e986fcb59dfca0ebfcd4db2a8e (diff) | |
| download | fdk-aac-ed56e77acb1ca4524bf49d9cdec7d11a51f5134d.tar.gz fdk-aac-ed56e77acb1ca4524bf49d9cdec7d11a51f5134d.tar.bz2 fdk-aac-ed56e77acb1ca4524bf49d9cdec7d11a51f5134d.zip | |
Merge "Do not support channel configuration change within PCE"
| -rw-r--r-- | libAACdec/src/aacdecoder.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
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 @@ static int CProgramConfigElement_Read(HANDLE_FDK_BITSTREAM bs, 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; |