bc1d31e148
Push force replace ( #2899 )
...
Co-authored-by: Alex <liyu7352@gmail.com>
Co-authored-by: xia-chu <771730766@qq.com>
Co-authored-by: Johnny <hellojinqiang@gmail.com>
Co-authored-by: BackT0TheFuture <10088733+BackT0TheFuture@users.noreply.github.com>
Co-authored-by: ljx0305 <ljx0305@gmail.com>
Co-authored-by: Per-Arne Andersen <per@sysx.no>
Co-authored-by: codeRATny <60806889+codeRATny@users.noreply.github.com>
Co-authored-by: 老衲不出家 <tannzh2018@outlook.com>
Co-authored-by: Kiki <haijuanchen.sun@gmail.com>
Co-authored-by: PioLing <964472638@qq.com>
Co-authored-by: dengjfzh <76604422+dengjfzh@users.noreply.github.com>
Co-authored-by: a-ucontrol <55526028+a-ucontrol@users.noreply.github.com>
Co-authored-by: 百鸣 <94030128+ixingqiao@users.noreply.github.com>
Co-authored-by: fruit Juice <2317232721@qq.com>
Co-authored-by: Luosh <fjlshyyyy@qq.com>
Co-authored-by: tbago <moonzalor@gmail.com>
Co-authored-by: Talus <xiaoxiaochenjian@gmail.com>
Co-authored-by: 朱如洪 <zhu410289616@163.com>
Co-authored-by: pedoc <pedoc@qq.com>
Co-authored-by: XiaoYan Lin <linxiaoyan87@foxmail.com>
Co-authored-by: xiangshengjye <46069012+xiangshengjye@users.noreply.github.com>
Co-authored-by: tjpgt <602950305@qq.com>
Co-authored-by: Nick <joyouswind@gmail.com>
Co-authored-by: yogo-zhangyingzhe <100331270+yogo-zhangyingzhe@users.noreply.github.com>
Co-authored-by: Xiaofeng Wang <wasphin@gmail.com>
Co-authored-by: Dw9 <xweimvp@gmail.com>
Co-authored-by: waken <33921191+mc373906408@users.noreply.github.com>
Co-authored-by: Deepslient <1154547394@qq.com>
2023-10-12 17:09:20 +08:00
7e95bd2078
修复MSVC编译问题
2022-11-03 10:51:49 +08:00
35791aac89
优化代码，去除编译警告，修复拼写错误
2022-08-08 17:36:07 +08:00
43c5d05d8f
使用clone替代fork ( #1518 )
...
使用clone替代fork
因为fork子进程有时会导致提前写时复制, 进而影响性能.
而vfork又会引起父进程阻塞
所以使用clone来产生子进程运行ffmpeg
2022-03-27 21:25:40 +08:00
63f22ee6f2
截图失败时，返回ffmpeg日志; ffmpeg命令支持相对路径
2022-02-24 11:28:48 +08:00
c72cf4cbcc
整理命名空间 ( #1409 )
...
* feat: remove using namespace mediakit in header files.
(cherry picked from commit d44aeb339a8a0e1f0455be82b21fe4b1b536299f)
* feat: remove using namespace mediakit in FFmpegSource.h
* feat: remove using namespace mediakit in RtpExt.h
* feat: remove using namespace mediakit in header files.
* feat: remove using namespace std in header files.
* feat: remove using namespace std in header files when zltoolkit remove std in header
* 补充命名空间
* 整理命名空间
* 整理命名空间2
* 修复macos ci
* 修复编译问题
* 修复编译问题2
* 修复编译问题3
Co-authored-by: Johnny <hellojinqiang@gmail.com>
Co-authored-by: Xiaofeng Wang <wasphin@gmail.com>
2022-02-02 20:34:50 +08:00
b6cbc87712
全面整理代码，去除编译警告
2021-01-17 18:31:50 +08:00
a3089f9a7e
完善进程管理
2020-06-08 16:26:55 +08:00
7019e4717c
整理授权协议
2020-04-04 20:30:09 +08:00
16751ddf04
windows支持FFmpeg拉流代理
2020-01-07 15:10:59 +08:00
77bbc7ae4d
Merge remote-tracking branch 'FreeNVR/freenvr'
...
# Conflicts:
# server/FFmpegSource.cpp
# server/Process.cpp
# server/Process.h
# server/System.cpp
2020-01-07 15:08:15 +08:00
9c42c5ed8c
windows视频FFmpeg拉流代理
2020-01-07 14:37:18 +08:00
306e202ca1
1.添加windows下ffmpeg拉流分发支持，目前不是很完善，后续再修改
...
2.server/system下未兼容完成
2020-01-07 11:09:11 +08:00
8e48ab3463
解决defunct进程的问题
2019-10-24 11:42:39 +08:00
9fc31f3d3e
修复android下老版本ndk编译兼容性问题
2019-09-27 09:58:42 +08:00
7c7b9e560e
统一添加bom
2019-08-08 19:01:45 +08:00
4bd6b24c30
添加协议头
2019-06-11 09:25:54 +08:00
2f6773f180
添加完整的服务器用例
2019-05-20 11:22:59 +08:00
xiongguangjie
monktan89
ziyue
alexliyu7352
夏楚
Luke