1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-03-13 22:30:04 +01:00

Merge "Do not support channel configuration change within PCE" am: ed56e77acb

am: a82589476a

Change-Id: Ie9de704ba4aee6954e9ca82df8c56bc81a482c32
This commit is contained in:
Jean-Michel Trivi 2019-01-15 11:19:49 -08:00 committed by android-build-merger
commit 7ca245e21e

View File

@ -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;