diff --git a/CMakeLists.txt b/CMakeLists.txt index 71713a44..a794d4c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -project(ZLMediaKit) +project(ZLMediaKit) cmake_minimum_required(VERSION 2.8) #加载自定义模块 diff --git a/src/Codec/AACEncoder.cpp b/src/Codec/AACEncoder.cpp index 4e83c768..a6e19a5a 100644 --- a/src/Codec/AACEncoder.cpp +++ b/src/Codec/AACEncoder.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Codec/AACEncoder.h b/src/Codec/AACEncoder.h index 26df79d9..906979bc 100644 --- a/src/Codec/AACEncoder.h +++ b/src/Codec/AACEncoder.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Codec/H264Encoder.cpp b/src/Codec/H264Encoder.cpp index f155e40f..53834083 100644 --- a/src/Codec/H264Encoder.cpp +++ b/src/Codec/H264Encoder.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Codec/H264Encoder.h b/src/Codec/H264Encoder.h index f401207d..5f707706 100644 --- a/src/Codec/H264Encoder.h +++ b/src/Codec/H264Encoder.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Common/MediaSender.h b/src/Common/MediaSender.h index 286684e1..b453ee57 100644 --- a/src/Common/MediaSender.h +++ b/src/Common/MediaSender.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Common/config.cpp b/src/Common/config.cpp index 5e65fad5..a0ab5168 100644 --- a/src/Common/config.cpp +++ b/src/Common/config.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Common/config.h b/src/Common/config.h index 49a9f6b9..720bc3a1 100644 --- a/src/Common/config.h +++ b/src/Common/config.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Device/Device.cpp b/src/Device/Device.cpp index cba96602..9245e117 100644 --- a/src/Device/Device.cpp +++ b/src/Device/Device.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Device/Device.h b/src/Device/Device.h index 2aa08091..57cf7a90 100644 --- a/src/Device/Device.h +++ b/src/Device/Device.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Device/PlayerProxy.cpp b/src/Device/PlayerProxy.cpp index e5df4cdc..3d0b1f9d 100644 --- a/src/Device/PlayerProxy.cpp +++ b/src/Device/PlayerProxy.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Device/PlayerProxy.h b/src/Device/PlayerProxy.h index b24891ff..6dc2fba1 100644 --- a/src/Device/PlayerProxy.h +++ b/src/Device/PlayerProxy.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Device/base64.cpp b/src/Device/base64.cpp index f649bfde..7de71c0e 100644 --- a/src/Device/base64.cpp +++ b/src/Device/base64.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com) * * This file is part of FFmpeg. diff --git a/src/Device/base64.h b/src/Device/base64.h index 6da4f28f..bb68b6dd 100644 --- a/src/Device/base64.h +++ b/src/Device/base64.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com) * * This file is part of FFmpeg. diff --git a/src/H264/H264Parser.cpp b/src/H264/H264Parser.cpp index 7a607457..c1ff4d2f 100644 --- a/src/H264/H264Parser.cpp +++ b/src/H264/H264Parser.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/H264/H264Parser.h b/src/H264/H264Parser.h index b96f1284..a67bb9bb 100644 --- a/src/H264/H264Parser.h +++ b/src/H264/H264Parser.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/H264/SPSParser.c b/src/H264/SPSParser.c index 342f407f..5fa0cb3c 100644 --- a/src/H264/SPSParser.c +++ b/src/H264/SPSParser.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include /* for uint32_t, etc */ diff --git a/src/H264/h264_bit_reader.cpp b/src/H264/h264_bit_reader.cpp index 92b3ac3d..c8afe6d4 100644 --- a/src/H264/h264_bit_reader.cpp +++ b/src/H264/h264_bit_reader.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/src/H264/h264_bit_reader.h b/src/H264/h264_bit_reader.h index 75569e48..42973980 100644 --- a/src/H264/h264_bit_reader.h +++ b/src/H264/h264_bit_reader.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/src/H264/h264_parser.cpp b/src/H264/h264_parser.cpp index ab39ea77..e5ef76b2 100644 --- a/src/H264/h264_parser.cpp +++ b/src/H264/h264_parser.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/src/H264/h264_parser.h b/src/H264/h264_parser.h index b2298257..be7d3ebf 100644 --- a/src/H264/h264_parser.h +++ b/src/H264/h264_parser.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/src/H264/h264_poc.cpp b/src/H264/h264_poc.cpp index ab15975a..3b4198d5 100644 --- a/src/H264/h264_poc.cpp +++ b/src/H264/h264_poc.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/src/H264/h264_poc.h b/src/H264/h264_poc.h index a83990d1..a46af999 100644 --- a/src/H264/h264_poc.h +++ b/src/H264/h264_poc.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/src/H264/macros.h b/src/H264/macros.h index 3570ae9e..ad4d0958 100644 --- a/src/H264/macros.h +++ b/src/H264/macros.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/src/H264/ranges.h b/src/H264/ranges.h index ab89b5f4..482fb1c7 100644 --- a/src/H264/ranges.h +++ b/src/H264/ranges.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/src/Http/HttpClient.cpp b/src/Http/HttpClient.cpp index 9e0f0169..6664186d 100644 --- a/src/Http/HttpClient.cpp +++ b/src/Http/HttpClient.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpClient.h b/src/Http/HttpClient.h index f46e755c..1bdf80d2 100644 --- a/src/Http/HttpClient.h +++ b/src/Http/HttpClient.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpClientImp.cpp b/src/Http/HttpClientImp.cpp index 7c5e53b3..f695b2f1 100644 --- a/src/Http/HttpClientImp.cpp +++ b/src/Http/HttpClientImp.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpClientImp.h b/src/Http/HttpClientImp.h index 3e6e3b01..c397daff 100644 --- a/src/Http/HttpClientImp.h +++ b/src/Http/HttpClientImp.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpDownloader.cpp b/src/Http/HttpDownloader.cpp index ba570814..6b7e8b0d 100644 --- a/src/Http/HttpDownloader.cpp +++ b/src/Http/HttpDownloader.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpDownloader.h b/src/Http/HttpDownloader.h index d5ce0633..3be00e93 100644 --- a/src/Http/HttpDownloader.h +++ b/src/Http/HttpDownloader.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpRequester.cpp b/src/Http/HttpRequester.cpp index 4e0e341a..b518523f 100644 --- a/src/Http/HttpRequester.cpp +++ b/src/Http/HttpRequester.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpRequester.h b/src/Http/HttpRequester.h index a8aefd55..42dff595 100644 --- a/src/Http/HttpRequester.h +++ b/src/Http/HttpRequester.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpSession.cpp b/src/Http/HttpSession.cpp index e0d9daf9..67e12cea 100644 --- a/src/Http/HttpSession.cpp +++ b/src/Http/HttpSession.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpSession.h b/src/Http/HttpSession.h index 8d1614b9..3a65e8d5 100644 --- a/src/Http/HttpSession.h +++ b/src/Http/HttpSession.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Http/HttpsSession.h b/src/Http/HttpsSession.h index e6d0e647..02e0bb6f 100644 --- a/src/Http/HttpsSession.h +++ b/src/Http/HttpsSession.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Http/strCoding.cpp b/src/Http/strCoding.cpp index 9b7a27c5..979a6e94 100644 --- a/src/Http/strCoding.cpp +++ b/src/Http/strCoding.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Http/strCoding.h b/src/Http/strCoding.h index 782eb3da..a891c53a 100644 --- a/src/Http/strCoding.h +++ b/src/Http/strCoding.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/HLSMaker.cpp b/src/MediaFile/HLSMaker.cpp index abf02546..23252b03 100644 --- a/src/MediaFile/HLSMaker.cpp +++ b/src/MediaFile/HLSMaker.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/HLSMaker.h b/src/MediaFile/HLSMaker.h index d87385b8..4155d474 100644 --- a/src/MediaFile/HLSMaker.h +++ b/src/MediaFile/HLSMaker.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/MediaReader.cpp b/src/MediaFile/MediaReader.cpp index 34ffa520..9247b1b3 100644 --- a/src/MediaFile/MediaReader.cpp +++ b/src/MediaFile/MediaReader.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/MediaReader.h b/src/MediaFile/MediaReader.h index 4a94dbc8..aeb671a1 100644 --- a/src/MediaFile/MediaReader.h +++ b/src/MediaFile/MediaReader.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/MediaRecorder.cpp b/src/MediaFile/MediaRecorder.cpp index 3b3f51ee..e594db66 100644 --- a/src/MediaFile/MediaRecorder.cpp +++ b/src/MediaFile/MediaRecorder.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/MediaRecorder.h b/src/MediaFile/MediaRecorder.h index 23c4db48..39fcbb1e 100644 --- a/src/MediaFile/MediaRecorder.h +++ b/src/MediaFile/MediaRecorder.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/Mp4Maker.cpp b/src/MediaFile/Mp4Maker.cpp index 7a82acb4..e2093fb5 100644 --- a/src/MediaFile/Mp4Maker.cpp +++ b/src/MediaFile/Mp4Maker.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/Mp4Maker.h b/src/MediaFile/Mp4Maker.h index ce598b2f..d71f7017 100644 --- a/src/MediaFile/Mp4Maker.h +++ b/src/MediaFile/Mp4Maker.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/TSMaker.cpp b/src/MediaFile/TSMaker.cpp index 86ab0546..66d3c418 100644 --- a/src/MediaFile/TSMaker.cpp +++ b/src/MediaFile/TSMaker.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/TSMaker.h b/src/MediaFile/TSMaker.h index c8ed1b59..a5f9fbc8 100644 --- a/src/MediaFile/TSMaker.h +++ b/src/MediaFile/TSMaker.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/MediaFile/crc32.cpp b/src/MediaFile/crc32.cpp index 8e923756..6e781374 100644 --- a/src/MediaFile/crc32.cpp +++ b/src/MediaFile/crc32.cpp @@ -1,4 +1,4 @@ -#include "crc32.h" +#include "crc32.h" #define BSWAP16C(x) (((x) << 8 & 0xff00) | ((x) >> 8 & 0x00ff)) #define BSWAP32C(x) (BSWAP16C(x) << 16 | BSWAP16C((x) >> 16)) diff --git a/src/MediaFile/crc32.h b/src/MediaFile/crc32.h index 9eaf7836..8629418a 100644 --- a/src/MediaFile/crc32.h +++ b/src/MediaFile/crc32.h @@ -1,4 +1,4 @@ -#ifndef CRC32_H_ +#ifndef CRC32_H_ #define CRC32_H_ unsigned int calc_crc32 (unsigned char *data, unsigned int datalen); diff --git a/src/Player/MediaPlayer.cpp b/src/Player/MediaPlayer.cpp index 5e431c6e..bcd72d24 100644 --- a/src/Player/MediaPlayer.cpp +++ b/src/Player/MediaPlayer.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Player/MediaPlayer.h b/src/Player/MediaPlayer.h index 9031bf1a..42ebfa17 100644 --- a/src/Player/MediaPlayer.h +++ b/src/Player/MediaPlayer.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Player/Player.cpp b/src/Player/Player.cpp index 8dbd0c19..0e3749e9 100644 --- a/src/Player/Player.cpp +++ b/src/Player/Player.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Player/Player.h b/src/Player/Player.h index de5a2da5..e826ee20 100644 --- a/src/Player/Player.h +++ b/src/Player/Player.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Player/PlayerBase.cpp b/src/Player/PlayerBase.cpp index a19d31fc..8b5e640e 100644 --- a/src/Player/PlayerBase.cpp +++ b/src/Player/PlayerBase.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Player/PlayerBase.h b/src/Player/PlayerBase.h index 26247dae..cdb069e5 100644 --- a/src/Player/PlayerBase.h +++ b/src/Player/PlayerBase.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/RTP/RtpMaker.h b/src/RTP/RtpMaker.h index 9b33afc0..c0a98386 100644 --- a/src/RTP/RtpMaker.h +++ b/src/RTP/RtpMaker.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/RTP/RtpMakerAAC.cpp b/src/RTP/RtpMakerAAC.cpp index 4a8db9b6..928fbbdf 100644 --- a/src/RTP/RtpMakerAAC.cpp +++ b/src/RTP/RtpMakerAAC.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/RTP/RtpMakerAAC.h b/src/RTP/RtpMakerAAC.h index 40d7e4dc..7a532418 100644 --- a/src/RTP/RtpMakerAAC.h +++ b/src/RTP/RtpMakerAAC.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/RTP/RtpMakerH264.cpp b/src/RTP/RtpMakerH264.cpp index 750dee29..41e08e6d 100644 --- a/src/RTP/RtpMakerH264.cpp +++ b/src/RTP/RtpMakerH264.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/RTP/RtpMakerH264.h b/src/RTP/RtpMakerH264.h index cfd61232..6a15c7e5 100644 --- a/src/RTP/RtpMakerH264.h +++ b/src/RTP/RtpMakerH264.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/Rtmp.h b/src/Rtmp/Rtmp.h index 401a78f2..d253de5a 100644 --- a/src/Rtmp/Rtmp.h +++ b/src/Rtmp/Rtmp.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpMediaSource.cpp b/src/Rtmp/RtmpMediaSource.cpp index e9cfc5ba..27a5486d 100644 --- a/src/Rtmp/RtmpMediaSource.cpp +++ b/src/Rtmp/RtmpMediaSource.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpMediaSource.h b/src/Rtmp/RtmpMediaSource.h index e9186dc9..7b2e0b78 100644 --- a/src/Rtmp/RtmpMediaSource.h +++ b/src/Rtmp/RtmpMediaSource.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpParser.cpp b/src/Rtmp/RtmpParser.cpp index b9980b81..af57e3e6 100644 --- a/src/Rtmp/RtmpParser.cpp +++ b/src/Rtmp/RtmpParser.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpParser.h b/src/Rtmp/RtmpParser.h index 237e7248..73ef1c63 100644 --- a/src/Rtmp/RtmpParser.h +++ b/src/Rtmp/RtmpParser.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpPlayer.cpp b/src/Rtmp/RtmpPlayer.cpp index 5814f813..6004f6d1 100644 --- a/src/Rtmp/RtmpPlayer.cpp +++ b/src/Rtmp/RtmpPlayer.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpPlayer.h b/src/Rtmp/RtmpPlayer.h index 0c06c167..037d6316 100644 --- a/src/Rtmp/RtmpPlayer.h +++ b/src/Rtmp/RtmpPlayer.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpPlayerImp.cpp b/src/Rtmp/RtmpPlayerImp.cpp index 0c9ca67b..05abd2ab 100644 --- a/src/Rtmp/RtmpPlayerImp.cpp +++ b/src/Rtmp/RtmpPlayerImp.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpPlayerImp.h b/src/Rtmp/RtmpPlayerImp.h index afc3c8dd..277da067 100644 --- a/src/Rtmp/RtmpPlayerImp.h +++ b/src/Rtmp/RtmpPlayerImp.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpProtocol.cpp b/src/Rtmp/RtmpProtocol.cpp index dc996820..70516819 100644 --- a/src/Rtmp/RtmpProtocol.cpp +++ b/src/Rtmp/RtmpProtocol.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpProtocol.h b/src/Rtmp/RtmpProtocol.h index cfece944..ecaa0dbc 100644 --- a/src/Rtmp/RtmpProtocol.h +++ b/src/Rtmp/RtmpProtocol.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpPusher.cpp b/src/Rtmp/RtmpPusher.cpp index 6eb48e8f..6c3e8da3 100644 --- a/src/Rtmp/RtmpPusher.cpp +++ b/src/Rtmp/RtmpPusher.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpPusher.h b/src/Rtmp/RtmpPusher.h index ac3ae0ce..1c27a2ff 100644 --- a/src/Rtmp/RtmpPusher.h +++ b/src/Rtmp/RtmpPusher.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpSession.cpp b/src/Rtmp/RtmpSession.cpp index 35a9ec12..3b5117e2 100644 --- a/src/Rtmp/RtmpSession.cpp +++ b/src/Rtmp/RtmpSession.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpSession.h b/src/Rtmp/RtmpSession.h index 316f552f..ff92a9ac 100644 --- a/src/Rtmp/RtmpSession.h +++ b/src/Rtmp/RtmpSession.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpToRtspMediaSource.cpp b/src/Rtmp/RtmpToRtspMediaSource.cpp index f144602d..de6053b9 100644 --- a/src/Rtmp/RtmpToRtspMediaSource.cpp +++ b/src/Rtmp/RtmpToRtspMediaSource.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/RtmpToRtspMediaSource.h b/src/Rtmp/RtmpToRtspMediaSource.h index 26e886b3..645b04fe 100644 --- a/src/Rtmp/RtmpToRtspMediaSource.h +++ b/src/Rtmp/RtmpToRtspMediaSource.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/amf.cpp b/src/Rtmp/amf.cpp index 43b115e7..a60bef90 100644 --- a/src/Rtmp/amf.cpp +++ b/src/Rtmp/amf.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/amf.h b/src/Rtmp/amf.h index a4b9639a..1803d6f5 100644 --- a/src/Rtmp/amf.h +++ b/src/Rtmp/amf.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/utils.cpp b/src/Rtmp/utils.cpp index fc0a5be3..780caff2 100644 --- a/src/Rtmp/utils.cpp +++ b/src/Rtmp/utils.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtmp/utils.h b/src/Rtmp/utils.h index 7a3207cb..9c55423e 100644 --- a/src/Rtmp/utils.h +++ b/src/Rtmp/utils.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtpBroadCaster.cpp b/src/Rtsp/RtpBroadCaster.cpp index ab985234..a85fb9b8 100644 --- a/src/Rtsp/RtpBroadCaster.cpp +++ b/src/Rtsp/RtpBroadCaster.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtpBroadCaster.h b/src/Rtsp/RtpBroadCaster.h index f406f18f..55b359b6 100644 --- a/src/Rtsp/RtpBroadCaster.h +++ b/src/Rtsp/RtpBroadCaster.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtpParser.cpp b/src/Rtsp/RtpParser.cpp index 7e644332..a97c37ae 100644 --- a/src/Rtsp/RtpParser.cpp +++ b/src/Rtsp/RtpParser.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtpParser.h b/src/Rtsp/RtpParser.h index 568c2e8e..b45f726a 100644 --- a/src/Rtsp/RtpParser.h +++ b/src/Rtsp/RtpParser.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/Rtsp.cpp b/src/Rtsp/Rtsp.cpp index 44f21161..875fc1a6 100644 --- a/src/Rtsp/Rtsp.cpp +++ b/src/Rtsp/Rtsp.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/Rtsp.h b/src/Rtsp/Rtsp.h index ba59ed93..14d80d93 100644 --- a/src/Rtsp/Rtsp.h +++ b/src/Rtsp/Rtsp.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtspMediaSource.cpp b/src/Rtsp/RtspMediaSource.cpp index 1edfbf74..ad57c83f 100644 --- a/src/Rtsp/RtspMediaSource.cpp +++ b/src/Rtsp/RtspMediaSource.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtspMediaSource.h b/src/Rtsp/RtspMediaSource.h index 520dd8fb..0d7c02f3 100644 --- a/src/Rtsp/RtspMediaSource.h +++ b/src/Rtsp/RtspMediaSource.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtspPlayer.cpp b/src/Rtsp/RtspPlayer.cpp index ab9418ec..64a8f6c4 100644 --- a/src/Rtsp/RtspPlayer.cpp +++ b/src/Rtsp/RtspPlayer.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtspPlayer.h b/src/Rtsp/RtspPlayer.h index 2b76c237..436b8227 100644 --- a/src/Rtsp/RtspPlayer.h +++ b/src/Rtsp/RtspPlayer.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtspPlayerImp.cpp b/src/Rtsp/RtspPlayerImp.cpp index f71f4a80..00542556 100644 --- a/src/Rtsp/RtspPlayerImp.cpp +++ b/src/Rtsp/RtspPlayerImp.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtspPlayerImp.h b/src/Rtsp/RtspPlayerImp.h index 4b2e2172..9d5a9a27 100644 --- a/src/Rtsp/RtspPlayerImp.h +++ b/src/Rtsp/RtspPlayerImp.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtspSession.cpp b/src/Rtsp/RtspSession.cpp index 67c364eb..b7fb91b0 100644 --- a/src/Rtsp/RtspSession.cpp +++ b/src/Rtsp/RtspSession.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtspSession.h b/src/Rtsp/RtspSession.h index d54f1772..f6a5e496 100644 --- a/src/Rtsp/RtspSession.h +++ b/src/Rtsp/RtspSession.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtspToRtmpMediaSource.cpp b/src/Rtsp/RtspToRtmpMediaSource.cpp index 538a07a0..7686969d 100644 --- a/src/Rtsp/RtspToRtmpMediaSource.cpp +++ b/src/Rtsp/RtspToRtmpMediaSource.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/RtspToRtmpMediaSource.h b/src/Rtsp/RtspToRtmpMediaSource.h index 08bda477..b38f6c54 100644 --- a/src/Rtsp/RtspToRtmpMediaSource.h +++ b/src/Rtsp/RtspToRtmpMediaSource.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/UDPServer.cpp b/src/Rtsp/UDPServer.cpp index 40d3bcab..67bf38fb 100644 --- a/src/Rtsp/UDPServer.cpp +++ b/src/Rtsp/UDPServer.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Rtsp/UDPServer.h b/src/Rtsp/UDPServer.h index 7e31f07a..d870825b 100644 --- a/src/Rtsp/UDPServer.h +++ b/src/Rtsp/UDPServer.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Shell/CMD.cpp b/src/Shell/CMD.cpp index 41439811..03442141 100644 --- a/src/Shell/CMD.cpp +++ b/src/Shell/CMD.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Shell/CMD.h b/src/Shell/CMD.h index 13461c2a..f8c201de 100644 --- a/src/Shell/CMD.h +++ b/src/Shell/CMD.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Shell/ShellSession.cpp b/src/Shell/ShellSession.cpp index 5994ce3b..cc5b6750 100644 --- a/src/Shell/ShellSession.cpp +++ b/src/Shell/ShellSession.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/Shell/ShellSession.h b/src/Shell/ShellSession.h index a67a3ddc..88d79480 100644 --- a/src/Shell/ShellSession.h +++ b/src/Shell/ShellSession.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/src/win32/getopt.c b/src/win32/getopt.c index d933ea80..e8932a5e 100644 --- a/src/win32/getopt.c +++ b/src/win32/getopt.c @@ -1,4 +1,4 @@ -/* Getopt for GNU. +/* Getopt for GNU. NOTE: getopt is now part of the C library, so if you don't know what "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu before changing it! diff --git a/src/win32/getopt.h b/src/win32/getopt.h index 29ecbd22..3f4733cd 100644 --- a/src/win32/getopt.h +++ b/src/win32/getopt.h @@ -1,4 +1,4 @@ -/* Declarations for getopt. +/* Declarations for getopt. Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it diff --git a/src/win32/tailor.h b/src/win32/tailor.h index f94715d4..3444cd3e 100644 --- a/src/win32/tailor.h +++ b/src/win32/tailor.h @@ -1,4 +1,4 @@ -/* tailor.h -- target dependent definitions +/* tailor.h -- target dependent definitions * Copyright (C) 1992-1993 Jean-loup Gailly. * This is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License, see the file COPYING. diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1d336a57..c4d80dd8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -#查找SDL是否安装 +#查找SDL是否安装 find_package(SDL QUIET) if(SDL_FOUND) include_directories(${SDL_INCLUDE_DIR}) diff --git a/tests/DeviceHK/DeviceHK.cpp b/tests/DeviceHK/DeviceHK.cpp index 1e90b3cb..39f633ce 100644 --- a/tests/DeviceHK/DeviceHK.cpp +++ b/tests/DeviceHK/DeviceHK.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/tests/DeviceHK/DeviceHK.h b/tests/DeviceHK/DeviceHK.h index 1d2ec32e..698e9d5c 100644 --- a/tests/DeviceHK/DeviceHK.h +++ b/tests/DeviceHK/DeviceHK.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/tests/H264Decoder.h b/tests/H264Decoder.h index 9e6747a4..bf940845 100644 --- a/tests/H264Decoder.h +++ b/tests/H264Decoder.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/tests/README.txt b/tests/README.txt index e7f9690b..1c4c521d 100644 --- a/tests/README.txt +++ b/tests/README.txt @@ -1,3 +1,3 @@ -此目录下的所有.cpp文件将被编译成可执行程序(不包含此目录下的子目录). +此目录下的所有.cpp文件将被编译成可执行程序(不包含此目录下的子目录). 子目录DeviceHK为海康IPC的适配程序,需要先下载海康的SDK才能编译, 由于操作麻烦,所以仅把源码放在这仅供参考. diff --git a/tests/YuvDisplayer.h b/tests/YuvDisplayer.h index 0c4df36f..b2da7374 100644 --- a/tests/YuvDisplayer.h +++ b/tests/YuvDisplayer.h @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/tests/test_benchmark.cpp b/tests/test_benchmark.cpp index c736b938..ba16443e 100644 --- a/tests/test_benchmark.cpp +++ b/tests/test_benchmark.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/tests/test_httpClient.cpp b/tests/test_httpClient.cpp index 29d1bf78..66bea834 100644 --- a/tests/test_httpClient.cpp +++ b/tests/test_httpClient.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/tests/test_player.cpp b/tests/test_player.cpp index 730db8ad..5581a6bd 100644 --- a/tests/test_player.cpp +++ b/tests/test_player.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/tests/test_rtmpPusher.cpp b/tests/test_rtmpPusher.cpp index 16537105..80e36cb2 100644 --- a/tests/test_rtmpPusher.cpp +++ b/tests/test_rtmpPusher.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/tests/test_rtmpPusherMp4.cpp b/tests/test_rtmpPusherMp4.cpp index 3fb44e3b..e0c0254a 100644 --- a/tests/test_rtmpPusherMp4.cpp +++ b/tests/test_rtmpPusherMp4.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com> diff --git a/tests/test_server.cpp b/tests/test_server.cpp index 55aab3cc..64a0c1c7 100644 --- a/tests/test_server.cpp +++ b/tests/test_server.cpp @@ -1,4 +1,4 @@ -/* +/* * MIT License * * Copyright (c) 2016 xiongziliang <771730766@qq.com>