diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-30 22:55:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-30 22:55:01 +0000 |
| commit | 1fcc47f50f9140e5938bea6b87c8ac602500481b (patch) | |
| tree | a6921fe99812e7721f5f127a1e8bcf3ff38f071c /libFDK/include | |
| parent | cb4a2b7820b095fa9e5a09343ea595126d70db1f (diff) | |
| parent | 851785f791cf0f05125a4887363517aa6195ff12 (diff) | |
| download | fdk-aac-1fcc47f50f9140e5938bea6b87c8ac602500481b.tar.gz fdk-aac-1fcc47f50f9140e5938bea6b87c8ac602500481b.tar.bz2 fdk-aac-1fcc47f50f9140e5938bea6b87c8ac602500481b.zip | |
Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." into sc-dev am: af61f20a8d am: 851785f791
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386930
Change-Id: I8dfd4b3dd4d9f0259137cc29fd68fc3edf1fcdce
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] |