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 /libMpegTPEnc/src | |
| 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 'libMpegTPEnc/src')
| -rw-r--r-- | libMpegTPEnc/src/tpenc_lib.cpp | 5 | ||||
| -rw-r--r-- | libMpegTPEnc/src/version | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libMpegTPEnc/src/tpenc_lib.cpp b/libMpegTPEnc/src/tpenc_lib.cpp index d0a2fec..24fb32f 100644 --- a/libMpegTPEnc/src/tpenc_lib.cpp +++ b/libMpegTPEnc/src/tpenc_lib.cpp @@ -619,8 +619,13 @@ TRANSPORTENC_ERROR transportEnc_GetLibInfo( LIB_INFO *info ) info->module_id = FDK_TPENC; info->version = LIB_VERSION(TP_LIB_VL0, TP_LIB_VL1, TP_LIB_VL2); LIB_VERSION_STRING(info); +#ifdef __ANDROID__ + info->build_date = ""; + info->build_time = ""; +#else info->build_date = __DATE__; info->build_time = __TIME__; +#endif info->title = TP_LIB_TITLE; /* Set flags */ diff --git a/libMpegTPEnc/src/version b/libMpegTPEnc/src/version index cda01c8..fc7e5f0 100644 --- a/libMpegTPEnc/src/version +++ b/libMpegTPEnc/src/version @@ -4,5 +4,10 @@ #define TP_LIB_VL1 3 #define TP_LIB_VL2 4 #define TP_LIB_TITLE "MPEG Transport" +#ifdef __ANDROID__ +#define TP_LIB_BUILD_DATE "" +#define TP_LIB_BUILD_TIME "" +#else #define TP_LIB_BUILD_DATE __DATE__ #define TP_LIB_BUILD_TIME __TIME__ +#endif |