diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit index 3bc5bcf9..2bb23400 160000 --- a/3rdpart/ZLToolKit +++ b/3rdpart/ZLToolKit @@ -1 +1 @@ -Subproject commit 3bc5bcf917a6ff9fe0c50ed1751e61c04aacc413 +Subproject commit 2bb234006c852b1d1a61a0e9a7f39dde7105fe34 diff --git a/Android/app/src/main/cpp/native-lib.cpp b/Android/app/src/main/cpp/native-lib.cpp index 79538cfd..91faeb28 100644 --- a/Android/app/src/main/cpp/native-lib.cpp +++ b/Android/app/src/main/cpp/native-lib.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "test_server.cpp" diff --git a/server/FFmpegSource.cpp b/server/FFmpegSource.cpp index c05c8dc5..90805cd5 100644 --- a/server/FFmpegSource.cpp +++ b/server/FFmpegSource.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/server/FFmpegSource.h b/server/FFmpegSource.h index 9607bc18..6be92fc3 100644 --- a/server/FFmpegSource.h +++ b/server/FFmpegSource.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/server/Process.cpp b/server/Process.cpp index bde961b8..984657a7 100644 --- a/server/Process.cpp +++ b/server/Process.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/server/Process.h b/server/Process.h index c86ef678..1276cf28 100644 --- a/server/Process.h +++ b/server/Process.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/server/System.cpp b/server/System.cpp index c74c3699..0a0e3dde 100644 --- a/server/System.cpp +++ b/server/System.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/server/System.h b/server/System.h index 84cd46a3..c8857a73 100644 --- a/server/System.h +++ b/server/System.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/server/WebApi.h b/server/WebApi.h index e758abed..c3ffecf1 100644 --- a/server/WebApi.h +++ b/server/WebApi.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/server/WebHook.cpp b/server/WebHook.cpp index 5e413193..dffaf735 100644 --- a/server/WebHook.cpp +++ b/server/WebHook.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/server/WebHook.h b/server/WebHook.h index ce3b49bc..14af5974 100644 --- a/server/WebHook.h +++ b/server/WebHook.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/Common/Parser.cpp b/src/Common/Parser.cpp index 58bb8ffd..e24fa630 100644 --- a/src/Common/Parser.cpp +++ b/src/Common/Parser.cpp @@ -1,4 +1,4 @@ -// +// // Created by xzl on 2019/6/28. // diff --git a/src/Common/Parser.h b/src/Common/Parser.h index bfe2ceed..bf9854a7 100644 --- a/src/Common/Parser.h +++ b/src/Common/Parser.h @@ -1,4 +1,4 @@ -// +// // Created by xzl on 2019/6/28. // diff --git a/src/Extension/H264.h b/src/Extension/H264.h index bfe77861..df14031d 100644 --- a/src/Extension/H264.h +++ b/src/Extension/H264.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpClient.cpp b/src/Http/HttpClient.cpp index 3f98c60c..d9eafee0 100644 --- a/src/Http/HttpClient.cpp +++ b/src/Http/HttpClient.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpCookieManager.cpp b/src/Http/HttpCookieManager.cpp index 46fbad6a..8bd5da1b 100644 --- a/src/Http/HttpCookieManager.cpp +++ b/src/Http/HttpCookieManager.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpCookieManager.h b/src/Http/HttpCookieManager.h index 0bf18c98..172f4b08 100644 --- a/src/Http/HttpCookieManager.h +++ b/src/Http/HttpCookieManager.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/HlsMaker.cpp b/src/MediaFile/HlsMaker.cpp index b3ea0cea..5e88b31a 100644 --- a/src/MediaFile/HlsMaker.cpp +++ b/src/MediaFile/HlsMaker.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/HlsMaker.h b/src/MediaFile/HlsMaker.h index 69dc3c6f..37f6d671 100644 --- a/src/MediaFile/HlsMaker.h +++ b/src/MediaFile/HlsMaker.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/HlsMakerImp.cpp b/src/MediaFile/HlsMakerImp.cpp index f1f3e80f..ece25b73 100644 --- a/src/MediaFile/HlsMakerImp.cpp +++ b/src/MediaFile/HlsMakerImp.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/HlsMakerImp.h b/src/MediaFile/HlsMakerImp.h index 447aa126..d04de216 100644 --- a/src/MediaFile/HlsMakerImp.h +++ b/src/MediaFile/HlsMakerImp.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/HlsRecorder.h b/src/MediaFile/HlsRecorder.h index 1684f28c..7b876ae0 100644 --- a/src/MediaFile/HlsRecorder.h +++ b/src/MediaFile/HlsRecorder.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/MP4Muxer.cpp b/src/MediaFile/MP4Muxer.cpp index 3f575e83..92b0135c 100644 --- a/src/MediaFile/MP4Muxer.cpp +++ b/src/MediaFile/MP4Muxer.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/MP4Muxer.h b/src/MediaFile/MP4Muxer.h index a1191b79..de15d4cc 100644 --- a/src/MediaFile/MP4Muxer.h +++ b/src/MediaFile/MP4Muxer.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/Stamp.cpp b/src/MediaFile/Stamp.cpp index 544559c5..d4b67df9 100644 --- a/src/MediaFile/Stamp.cpp +++ b/src/MediaFile/Stamp.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/Stamp.h b/src/MediaFile/Stamp.h index a99269a8..e6b2d3b2 100644 --- a/src/MediaFile/Stamp.h +++ b/src/MediaFile/Stamp.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/TsMuxer.cpp b/src/MediaFile/TsMuxer.cpp index cc685a73..6bd4840e 100644 --- a/src/MediaFile/TsMuxer.cpp +++ b/src/MediaFile/TsMuxer.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/TsMuxer.h b/src/MediaFile/TsMuxer.h index 14a65f6c..476a56ae 100644 --- a/src/MediaFile/TsMuxer.h +++ b/src/MediaFile/TsMuxer.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/Pusher/MediaPusher.cpp b/src/Pusher/MediaPusher.cpp index d46f9579..78475fb1 100644 --- a/src/Pusher/MediaPusher.cpp +++ b/src/Pusher/MediaPusher.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/Pusher/MediaPusher.h b/src/Pusher/MediaPusher.h index c4b8b957..aba11f64 100644 --- a/src/Pusher/MediaPusher.h +++ b/src/Pusher/MediaPusher.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/Pusher/PusherBase.cpp b/src/Pusher/PusherBase.cpp index a8f47d92..7637e389 100644 --- a/src/Pusher/PusherBase.cpp +++ b/src/Pusher/PusherBase.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/Pusher/PusherBase.h b/src/Pusher/PusherBase.h index cf9b1d8d..6fc86e5b 100644 --- a/src/Pusher/PusherBase.h +++ b/src/Pusher/PusherBase.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtspPusher.cpp b/src/Rtsp/RtspPusher.cpp index bb5f9431..d468ddc8 100644 --- a/src/Rtsp/RtspPusher.cpp +++ b/src/Rtsp/RtspPusher.cpp @@ -1,4 +1,4 @@ -// +// // Created by xzl on 2019/3/27. // diff --git a/src/Rtsp/RtspPusher.h b/src/Rtsp/RtspPusher.h index b01af46f..aa8232bd 100644 --- a/src/Rtsp/RtspPusher.h +++ b/src/Rtsp/RtspPusher.h @@ -1,4 +1,4 @@ -// +// // Created by xzl on 2019/3/27. // diff --git a/src/Rtsp/RtspSession.cpp b/src/Rtsp/RtspSession.cpp index d3677ca5..a7449920 100644 --- a/src/Rtsp/RtspSession.cpp +++ b/src/Rtsp/RtspSession.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtspSession.h b/src/Rtsp/RtspSession.h index 35019881..51561c6c 100644 --- a/src/Rtsp/RtspSession.h +++ b/src/Rtsp/RtspSession.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> diff --git a/tests/test_httpClient.cpp b/tests/test_httpClient.cpp index 4b6f12d2..7aaf167d 100644 --- a/tests/test_httpClient.cpp +++ b/tests/test_httpClient.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com>