diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2019-01-15 11:29:03 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-15 11:29:03 -0800 |
| commit | 2a2c62fbed2e76125a7a48aed6b6ea2d09eabf7b (patch) | |
| tree | 7dc8c94b00ba340cdaa91498c56191749205a43f /libAACdec/src | |
| parent | 9dc118a7d12e117cc552825503ff793b6e945d93 (diff) | |
| parent | 7ca245e21efa4ca0c934833a3763365d85daf6bf (diff) | |
| download | fdk-aac-2a2c62fbed2e76125a7a48aed6b6ea2d09eabf7b.tar.gz fdk-aac-2a2c62fbed2e76125a7a48aed6b6ea2d09eabf7b.tar.bz2 fdk-aac-2a2c62fbed2e76125a7a48aed6b6ea2d09eabf7b.zip | |
Merge "Do not support channel configuration change within PCE" am: ed56e77acb am: a82589476a
am: 7ca245e21e
Change-Id: Ic339d07a62ddbecdc6c2efcd5834e5758c90f70f
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; |