mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-12-05 09:21:59 +08:00
修复FrameMerger输入不可缓存帧相关bug
This commit is contained in:
parent
4f8127f6f1
commit
f5d5b71731
@ -261,7 +261,7 @@ static bool isNeedMerge(CodecId codec){
|
|||||||
|
|
||||||
bool FrameMerger::inputFrame(const Frame::Ptr &frame, onOutput cb, BufferLikeString *buffer) {
|
bool FrameMerger::inputFrame(const Frame::Ptr &frame, onOutput cb, BufferLikeString *buffer) {
|
||||||
if (frame && !isNeedMerge(frame->getCodecId())) {
|
if (frame && !isNeedMerge(frame->getCodecId())) {
|
||||||
cb(frame->dts(), frame->pts(), frame, true);
|
cb(frame->dts(), frame->pts(), Frame::getCacheAbleFrame(frame), true);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (willFlush(frame)) {
|
if (willFlush(frame)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user