amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
4,353 Commits 16 Branches 0 Tags 225 MiB
feature/transcode2
Commit Graph

4 Commits

Author SHA1 Message Date
cqm
e6838f24af fixed build issue 2024-07-15 08:47:31 +08:00
cqm
2ffdfab71e Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into transcode2 
# Conflicts:
#	CMakeLists.txt
#	conf/config.ini
#	src/Common/MediaSink.cpp
#	src/Common/MediaSink.h
#	src/Common/MediaSource.cpp
#	src/Common/MultiMediaSourceMuxer.h
#	src/Common/config.cpp
#	src/Common/config.h
#	src/Extension/AAC.cpp
#	src/Extension/AAC.h
#	src/Rtsp/RtpCodec.h
#	src/Rtsp/RtspMuxer.cpp
#	src/Rtsp/RtspMuxer.h
#	webrtc/Nack.cpp
#	webrtc/WebRtcTransport.cpp
 2024-07-15 08:47:30 +08:00
cqm
9bf48567b2 fixed issue #2874, thanks quxiaohui-debug 2023-10-16 09:51:20 +08:00
cqm
f4b2fd9c05 重构 audio_transcode 代码： 
- 独立出 RtcMediaSource，并只对rtc开放
- 增加Rtc g711转码开关
- 修改说明
 2023-08-14 13:04:18 +08:00