1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-18 04:00:36 +01:00

Merge "Merge Android 12 QPR 3"

This commit is contained in:
Xin Li 2022-06-16 18:51:56 +00:00 committed by Gerrit Code Review
commit cb00f5235d

View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android Software License for The Fraunhofer FDK AAC Codec Library for Android
© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten © Copyright 1995 - 2022 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -351,6 +351,12 @@ TRANSPORTDEC_ERROR transportDec_OutOfBandConfig(HANDLE_TRANSPORTDEC hTp,
} }
} }
} }
/* if an error is detected terminate config parsing to avoid that an invalid
* config is accepted in the second pass */
if (err != TRANSPORTDEC_OK) {
break;
}
} }
if (err == TRANSPORTDEC_OK && fConfigFound) { if (err == TRANSPORTDEC_OK && fConfigFound) {