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

Merge remote-tracking branch 'upstream/master' into master

Browse Source
This commit is contained in:
monktan
2020-09-21 15:50:15 +08:00
parent 0b33bc1888 416d21df36
commit d3be28b1a9
13 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Record/MP4Demuxer.cpp
View File

@@ -275,7 +275,7 @@ vector<Track::Ptr> MP4Demuxer::getTracks(bool trackReady) const {
}
ret.push_back(pr.second);
}
return std::move(ret);
return ret;
}
uint64_t MP4Demuxer::getDurationMS() const {