diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-30 22:21:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-30 22:21:40 +0000 |
| commit | 6213667f45cfc5c613d2f80d20292b88a9159c03 (patch) | |
| tree | a6921fe99812e7721f5f127a1e8bcf3ff38f071c /libFDK/include | |
| parent | 84bd0de621719d39155e6f021fbe748e3ebdaa7c (diff) | |
| parent | af61f20a8d2f57e51a0602e769ffeee8c401185a (diff) | |
| download | fdk-aac-6213667f45cfc5c613d2f80d20292b88a9159c03.tar.gz fdk-aac-6213667f45cfc5c613d2f80d20292b88a9159c03.tar.bz2 fdk-aac-6213667f45cfc5c613d2f80d20292b88a9159c03.zip | |
Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." into sc-dev am: af61f20a8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386930
Change-Id: Ib27b4b3d38bbc153a07ada7f5eaac6bd9a8abc8a
Diffstat (limited to 'libFDK/include')
| -rw-r--r-- | libFDK/include/nlc_dec.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libFDK/include/nlc_dec.h b/libFDK/include/nlc_dec.h index cca97f1..aded569 100644 --- a/libFDK/include/nlc_dec.h +++ b/libFDK/include/nlc_dec.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -159,9 +159,6 @@ typedef enum { #ifndef HUFFDEC_PARAMS #define HUFFDEC_PARMS -#define PAIR_SHIFT 4 -#define PAIR_MASK 0xf - #define MAX_ENTRIES 168 #define HANDLE_HUFF_NODE const SHORT(*)[MAX_ENTRIES][2] |