diff options
| author | Xin Li <delphij@google.com> | 2022-04-18 21:01:07 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-04-18 21:01:07 +0000 |
| commit | 1f830f7196b0b0171f786bc4ab56a90bcbea43f9 (patch) | |
| tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 | |
| parent | 891e8c1f3aa896d37eb4c0eb623bcbf237940eeb (diff) | |
| parent | e72924914ca10a344d7410d7332552e95251fe94 (diff) | |
| download | fdk-aac-1f830f7196b0b0171f786bc4ab56a90bcbea43f9.tar.gz fdk-aac-1f830f7196b0b0171f786bc4ab56a90bcbea43f9.tar.bz2 fdk-aac-1f830f7196b0b0171f786bc4ab56a90bcbea43f9.zip | |
Merge sc-v2-dev-plus-aosp-without-vendor@8433047
Bug: 226662282
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Change-Id: I4df938df7886adc58185586190e27bcd16e17966
| -rw-r--r-- | libMpegTPDec/src/tpdec_lib.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libMpegTPDec/src/tpdec_lib.cpp b/libMpegTPDec/src/tpdec_lib.cpp index 091d011..8cd9cb0 100644 --- a/libMpegTPDec/src/tpdec_lib.cpp +++ b/libMpegTPDec/src/tpdec_lib.cpp @@ -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) { |