diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-30 22:05:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-30 22:05:35 +0000 |
| commit | af61f20a8d2f57e51a0602e769ffeee8c401185a (patch) | |
| tree | a6921fe99812e7721f5f127a1e8bcf3ff38f071c /libFDK/include/nlc_dec.h | |
| parent | c0c3096100529954061073f4822db5f35ee4d2a9 (diff) | |
| parent | a43c9f8822c3066efc91de366bb1b3c3bf88387a (diff) | |
| download | fdk-aac-af61f20a8d2f57e51a0602e769ffeee8c401185a.tar.gz fdk-aac-af61f20a8d2f57e51a0602e769ffeee8c401185a.tar.bz2 fdk-aac-af61f20a8d2f57e51a0602e769ffeee8c401185a.zip | |
Merge "Prevent undefined values for CODING_SCHEME type in huff_decode()." into sc-dev
Diffstat (limited to 'libFDK/include/nlc_dec.h')
| -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] |