diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-01-26 11:57:49 -0800 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-01-26 11:57:49 -0800 |
| commit | c8ad7a2ef919a54e2549df097bcf37838e6381b1 (patch) | |
| tree | 735fe06eedc3ffa43956f9adad4765c3b244e002 /libAACdec | |
| parent | 047376af8c47d45c78204112a7d1b873c93822bc (diff) | |
| parent | ca249e444bd59c5b2c3a094108f6c489f8ce80e1 (diff) | |
| download | fdk-aac-c8ad7a2ef919a54e2549df097bcf37838e6381b1.tar.gz fdk-aac-c8ad7a2ef919a54e2549df097bcf37838e6381b1.tar.bz2 fdk-aac-c8ad7a2ef919a54e2549df097bcf37838e6381b1.zip | |
Merge remote-tracking branch 'aosp/master' into update
Diffstat (limited to 'libAACdec')
| -rw-r--r-- | libAACdec/src/aacdecoder_lib.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp index 82f85ab..94eb3c0 100644 --- a/libAACdec/src/aacdecoder_lib.cpp +++ b/libAACdec/src/aacdecoder_lib.cpp @@ -112,8 +112,13 @@ amm-info@iis.fraunhofer.de #define AACDECODER_LIB_VL1 5 #define AACDECODER_LIB_VL2 10 #define AACDECODER_LIB_TITLE "AAC Decoder Lib" +#ifdef __ANDROID__ +#define AACDECODER_LIB_BUILD_DATE "" +#define AACDECODER_LIB_BUILD_TIME "" +#else #define AACDECODER_LIB_BUILD_DATE __DATE__ #define AACDECODER_LIB_BUILD_TIME __TIME__ +#endif static AAC_DECODER_ERROR setConcealMethod ( const HANDLE_AACDECODER self, |