Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-05 10:58:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into feature/transcode2

Browse Source 
# Conflicts:
#	src/Common/MediaSource.h
#	src/Common/config.h
#	src/Rtsp/RtspMediaSourceImp.h
#	src/Rtsp/RtspMediaSourceMuxer.h
#	src/Rtsp/RtspMuxer.cpp
#	webrtc/WebRtcTransport.cpp
This commit is contained in:
cqm
2024-09-22 11:40:39 +08:00
parent d329f76edf f3e2a29cbd
commit 89e21038c2
283 changed files with 10913 additions and 3055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext-codec/G711.h
View File

@@ -18,6 +18,10 @@ namespace mediakit{
/**
* G711音频通道
* G711 audio channel
* [AUTO-TRANSLATED:57f8bc08]
*/
class G711Track : public AudioTrackImp{
public: