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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
monktan
2020-12-07 11:40:22 +08:00
parent c9f698d374 dc3701e6cc
commit 394c540bba
27 changed files with 131 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Rtmp/Rtmp.h
View File

@@ -262,7 +262,7 @@ class VideoMeta : public Metadata{
public:
typedef std::shared_ptr<VideoMeta> Ptr;
VideoMeta(const VideoTrack::Ptr &video,int datarate = 5000);
VideoMeta(const VideoTrack::Ptr &video);
virtual ~VideoMeta(){}
CodecId getCodecId() const override{
@@ -276,7 +276,7 @@ class AudioMeta : public Metadata{
public:
typedef std::shared_ptr<AudioMeta> Ptr;
AudioMeta(const AudioTrack::Ptr &audio,int datarate = 160);
AudioMeta(const AudioTrack::Ptr &audio);
virtual ~AudioMeta(){}