Merge remote-tracking branch 'origin/master'

src/Extension/H264Rtp.cpp

@@ -234,7 +234,7 @@ void H264RtpEncoder::inputFrame(const Frame::Ptr &frame) {
         bool mark = false;
         int nOffset = 1;
         while (!mark) {
-            if (iLen < nOffset + iSize) {
+            if (iLen <= nOffset + iSize) {
                 //已经拆分结束
                 iSize = iLen - nOffset;
                 mark = true;
@@ -274,4 +274,4 @@ void H264RtpEncoder::makeH264Rtp(int nal_type,const void* data, unsigned int len
     RtpCodec::inputRtp(makeRtp(getTrackType(),data,len,mark,uiStamp),first_packet && nal_type == H264Frame::NAL_IDR);
 }
 
-}//namespace mediakit
\ No newline at end of file
+}//namespace mediakit

src/Extension/H265Rtp.cpp

@@ -166,7 +166,7 @@ void H265RtpEncoder::inputFrame(const Frame::Ptr &frame) {
         bool mark = false;
         int nOffset = 2;
         while (!mark) {
-            if (iLen < nOffset + maxSize) {			//是否拆分结束
+            if (iLen <= nOffset + maxSize) {			//是否拆分结束
                 maxSize = iLen - nOffset;
                 mark = true;
                 //FU end
@@ -208,4 +208,4 @@ void H265RtpEncoder::makeH265Rtp(int nal_type,const void* data, unsigned int len
     RtpCodec::inputRtp(makeRtp(getTrackType(),data,len,mark,uiStamp),first_packet && H265Frame::isKeyFrame(nal_type));
 }
 
-}//namespace mediakit
\ No newline at end of file
+}//namespace mediakit