diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-09 06:17:05 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-09 06:17:05 +0000 |
| commit | 1a42e84f6d9b52f19599361e0c60bf0c01e29188 (patch) | |
| tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 | |
| parent | 7417d04b2a4950c1d4afcb46dfb0eede28389742 (diff) | |
| parent | 9192d46a8ac8effa26db43d6b8d93e62fd6024b5 (diff) | |
| download | aac-android13-frc-networking-release.tar.gz | |
Snap for 8558685 from 9192d46a8ac8effa26db43d6b8d93e62fd6024b5 to tm-frc-networking-releaset_frc_net_330443000android13-frc-networking-release
Change-Id: I77711358b7bd0356a8618b58935892135443a783
| -rw-r--r-- | METADATA | 4 | ||||
| -rw-r--r-- | libMpegTPDec/src/tpdec_lib.cpp | 8 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,7 @@ +# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE +# CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE +# DEPENDING ON IT IN YOUR PROJECT. *** third_party { + license_note: "Software License for The Fraunhofer FDK AAC Codec Library for Android" license_type: BY_EXCEPTION_ONLY } 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) { |