diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit index ba5a796d..7cb850d7 160000 --- a/3rdpart/ZLToolKit +++ b/3rdpart/ZLToolKit @@ -1 +1 @@ -Subproject commit ba5a796d583cd2906e06ec15c0d942e484ea1dbf +Subproject commit 7cb850d79ba798e6d1f0bba7c655d38d2865ed92 diff --git a/server/FFmpegSource.cpp b/server/FFmpegSource.cpp index e76df0ed..3824f910 100644 --- a/server/FFmpegSource.cpp +++ b/server/FFmpegSource.cpp @@ -63,7 +63,7 @@ void FFmpegSource::play(const string &src_url,const string &dst_url,int timeout_ char cmd[1024] = {0}; snprintf(cmd, sizeof(cmd),ffmpeg_cmd.data(),ffmpeg_bin.data(),src_url.data(),dst_url.data()); - _process.run(cmd,File::absolutePath("",ffmpeg_log)); + _process.run(cmd,ffmpeg_log.empty() ? "" : File::absolutePath("",ffmpeg_log)); InfoL << cmd; if(_media_info._host == "127.0.0.1"){