1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-06-05 22:39:13 +02:00

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

am: 7ca245e21e

Change-Id: Ic339d07a62ddbecdc6c2efcd5834e5758c90f70f
This commit is contained in:
Jean-Michel Trivi
2019-01-15 11:29:03 -08:00
committed by android-build-merger

View File

@@ -540,12 +540,6 @@ static int CProgramConfigElement_Read(HANDLE_FDK_BITSTREAM bs,
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 -1: /* The channel configuration is completely different */
pceStatus = -1; /* Not supported! */
break;