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/tpenc_lib.cpp | |
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/tpenc_lib.cpp')
-rw-r--r-- | libMpegTPEnc/src/tpenc_lib.cpp | 5 |
1 files changed, 5 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 */ |