From 051c6863dd418c9cfbca787e449fbdeadde977c7 Mon Sep 17 00:00:00 2001 From: pans <pansen626@sina.com> Date: 星期二, 16 四月 2019 17:17:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq --- QiaoJiaSystem/EncodeServer/main.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/QiaoJiaSystem/EncodeServer/main.cpp b/QiaoJiaSystem/EncodeServer/main.cpp index 71056e1..fe839d4 100644 --- a/QiaoJiaSystem/EncodeServer/main.cpp +++ b/QiaoJiaSystem/EncodeServer/main.cpp @@ -28,7 +28,7 @@ int main(int argc, char **argv) { SAVE_APP_ARGS ENABLEGLOG(GET_STR_CONFIG("logPath").c_str()); - + std::cout<<__DATE__<<" "<<__TIME__<<std::endl; EncodeVideoManager encodeVideoManager; encodeVideoManager.start(); -- Gitblit v1.8.0