|
|
@@ -3923,7 +3923,7 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *packet)
|
|
|
uint8_t hbuf[RTMP_MAX_HEADER_SIZE] = { 0 };
|
|
|
char *header = (char *)hbuf;
|
|
|
int nSize, hSize, nToRead, nChunk;
|
|
|
- int didAlloc = FALSE;
|
|
|
+ // int didAlloc = FALSE;
|
|
|
|
|
|
RTMP_Log(RTMP_LOGDEBUG2, "%s: fd=%d", __FUNCTION__, r->m_sb.sb_socket);
|
|
|
|
|
|
@@ -4050,7 +4050,7 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *packet)
|
|
|
RTMP_Log(RTMP_LOGDEBUG, "%s, failed to allocate packet", __FUNCTION__);
|
|
|
return FALSE;
|
|
|
}
|
|
|
- didAlloc = TRUE;
|
|
|
+ // didAlloc = TRUE;
|
|
|
packet->m_headerType = (hbuf[0] & 0xc0) >> 6;
|
|
|
}
|
|
|
|
|
|
@@ -5339,8 +5339,8 @@ stopKeyframeSearch:
|
|
|
|
|
|
if (recopy)
|
|
|
{
|
|
|
- len = (unsigned int)(ret) > buflen ? buflen : ret;
|
|
|
- memcpy(buf, r->m_read.buf, len);
|
|
|
+ len = (unsigned int)(ret) > buflen ? buflen : (unsigned int)ret;
|
|
|
+ memcpy(buf, r->m_read.buf, len);
|
|
|
r->m_read.bufpos = r->m_read.buf + len;
|
|
|
r->m_read.buflen = ret - len;
|
|
|
}
|