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

This commit is contained in:
monktan
2020-10-19 12:18:00 +08:00
10 changed files with 307 additions and 34 deletions

View File

@@ -172,6 +172,7 @@ void TsMuxer::init() {
TsMuxer *muxer = (TsMuxer *) param;
muxer->onTs(packet, bytes, muxer->_timestamp, muxer->_is_idr_fast_packet);
muxer->_is_idr_fast_packet = false;
return 0;
}
};
if (_context == nullptr) {