diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 06:56:36 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 06:56:36 +0000 |
| commit | a753572d577f5aebb9927f232c3c9403a0ac1797 (patch) | |
| tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 | |
| parent | a3d0ae6a9848756aac24d2747b0496c3293bc7db (diff) | |
| parent | 09023836cbaffad69a2063eebbb742b4065b680a (diff) | |
| download | aac-android13-mainline-permission-release.tar.gz | |
Snap for 8564071 from 09023836cbaffad69a2063eebbb742b4065b680a to mainline-permission-releaseaml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030android13-mainline-permission-release
Change-Id: I8b57fc3971318f9f5d94fc592aab6a41812ba583
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | METADATA | 4 | ||||
| -rw-r--r-- | libMpegTPDec/src/tpdec_lib.cpp | 8 |
3 files changed, 12 insertions, 2 deletions
@@ -94,7 +94,7 @@ cc_library_static { apex_available: [ "//apex_available:platform", - "com.android.bluetooth.updatable", + "com.android.bluetooth", "com.android.media.swcodec", ], min_sdk_version: "29", @@ -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) { |