diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2019-01-15 11:19:49 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-15 11:19:49 -0800 |
| commit | 7ca245e21efa4ca0c934833a3763365d85daf6bf (patch) | |
| tree | ce380e48b3e5395a96e36fbfc3453d058a319b99 /libAACdec/src | |
| parent | 6d1247f2e235e26635aba13f5758b8ba61e11089 (diff) | |
| parent | a82589476a45199e0a6cb962bd1e6d38a2c4170a (diff) | |
| download | fdk-aac-7ca245e21efa4ca0c934833a3763365d85daf6bf.tar.gz fdk-aac-7ca245e21efa4ca0c934833a3763365d85daf6bf.tar.bz2 fdk-aac-7ca245e21efa4ca0c934833a3763365d85daf6bf.zip | |
Merge "Do not support channel configuration change within PCE" am: ed56e77acb
am: a82589476a
Change-Id: Ie9de704ba4aee6954e9ca82df8c56bc81a482c32
Diffstat (limited to 'libAACdec/src')
| -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; |