fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 50d66655ca 2p: b70aa8fe34 

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057

Bug: 224314979
Bug: 221734266
Change-Id: Ie6f6b59eb6b7602a90c550e4f7f4c1ada59d73f4
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
This commit is contained in:
Fraunhofer IIS FDK 2022-04-06 05:06:11 +00:00 committed by Presubmit Automerger Backend
parent 7ad4d71f15 b70aa8fe34
commit 72b79304b5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libMpegTPDec/src/tpdec_lib.cpp
View File

@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------------
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.
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) {