mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-26 20:47:08 +08:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
4281a1272e
@ -234,7 +234,7 @@ void H264RtpEncoder::inputFrame(const Frame::Ptr &frame) {
|
|||||||
bool mark = false;
|
bool mark = false;
|
||||||
int nOffset = 1;
|
int nOffset = 1;
|
||||||
while (!mark) {
|
while (!mark) {
|
||||||
if (iLen < nOffset + iSize) {
|
if (iLen <= nOffset + iSize) {
|
||||||
//已经拆分结束
|
//已经拆分结束
|
||||||
iSize = iLen - nOffset;
|
iSize = iLen - nOffset;
|
||||||
mark = true;
|
mark = true;
|
||||||
|
@ -166,7 +166,7 @@ void H265RtpEncoder::inputFrame(const Frame::Ptr &frame) {
|
|||||||
bool mark = false;
|
bool mark = false;
|
||||||
int nOffset = 2;
|
int nOffset = 2;
|
||||||
while (!mark) {
|
while (!mark) {
|
||||||
if (iLen < nOffset + maxSize) { //是否拆分结束
|
if (iLen <= nOffset + maxSize) { //是否拆分结束
|
||||||
maxSize = iLen - nOffset;
|
maxSize = iLen - nOffset;
|
||||||
mark = true;
|
mark = true;
|
||||||
//FU end
|
//FU end
|
||||||
|
Loading…
Reference in New Issue
Block a user