diff options
| author | Martin Storsjo <martin@martin.st> | 2013-11-01 10:46:40 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2013-11-01 10:46:40 +0200 |
| commit | 321233ee92e138f44294c7bb9a375eadad9d24fa (patch) | |
| tree | 1de928ad26325302f64c56603157f50095dcf2b1 /libPCMutils | |
| parent | fcb5f1b692cb8343de35e69f9084328c652cf690 (diff) | |
| parent | fa3eba16446cc8f2f5e2dfc20d86a49dbd37299e (diff) | |
| download | fdk-aac-321233ee92e138f44294c7bb9a375eadad9d24fa.tar.gz fdk-aac-321233ee92e138f44294c7bb9a375eadad9d24fa.tar.bz2 fdk-aac-321233ee92e138f44294c7bb9a375eadad9d24fa.zip | |
Merge remote-tracking branch 'aosp/kitkat-release' into kitkat-merge
Conflicts:
libAACenc/src/quantize.cpp
Diffstat (limited to 'libPCMutils')
| -rw-r--r-- | libPCMutils/include/pcmutils_lib.h | 2 | ||||
| -rw-r--r-- | libPCMutils/src/pcmutils_lib.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libPCMutils/include/pcmutils_lib.h b/libPCMutils/include/pcmutils_lib.h index fd4a26d..5ba74be 100644 --- a/libPCMutils/include/pcmutils_lib.h +++ b/libPCMutils/include/pcmutils_lib.h @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2012 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. +© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION diff --git a/libPCMutils/src/pcmutils_lib.cpp b/libPCMutils/src/pcmutils_lib.cpp index e0a9817..a84a050 100644 --- a/libPCMutils/src/pcmutils_lib.cpp +++ b/libPCMutils/src/pcmutils_lib.cpp @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2012 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. +© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -96,8 +96,8 @@ amm-info@iis.fraunhofer.de /* Decoder library info */ #define PCMDMX_LIB_VL0 2 -#define PCMDMX_LIB_VL1 3 -#define PCMDMX_LIB_VL2 1 +#define PCMDMX_LIB_VL1 4 +#define PCMDMX_LIB_VL2 0 #define PCMDMX_LIB_TITLE "PCM Downmix Lib" #define PCMDMX_LIB_BUILD_DATE __DATE__ #define PCMDMX_LIB_BUILD_TIME __TIME__ |