jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix all warnings in rtmp output

Browse Source
This commit is contained in:
BtbN 2014-05-09 17:19:05 +02:00
parent e958bc16e4
commit b3adef6c8d
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/obs-outputs/librtmp/parseurl.c
View File

@ -198,7 +198,7 @@ parsehost:
int RTMP_ParseURL2(const char *url, int *protocol, AVal *host, unsigned int *port,
AVal *app)
{
char *p, *end, *col, *ques, *slash;
char *p, *end, *col, /* *ques, */ *slash;
RTMP_Log(RTMP_LOGDEBUG, "Parsing...");
@ -255,7 +255,7 @@ parsehost:
end = p + strlen(p);
col = strchr(p, ':');
ques = strchr(p, '?');
// ques = strchr(p, '?');
slash = strchr(p, '/');
{

8
plugins/obs-outputs/librtmp/rtmp.c
View File

@ -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;
}

3
plugins/obs-outputs/rtmp-stream.c
View File

@ -21,6 +21,7 @@
#include <util/circlebuf.h>
#include <util/dstr.h>
#include <util/threading.h>
#include <inttypes.h>
#include "librtmp/rtmp.h"
#include "librtmp/log.h"
#include "flv-mux.h"
@ -505,7 +506,7 @@ static void check_to_drop_frames(struct rtmp_stream *stream)
buffer_duration_usec = stream->last_dts_usec - first.dts_usec;
if (buffer_duration_usec > stream->drop_threshold_usec) {
drop_frames(stream);
blog(LOG_INFO, "dropping %lld worth of frames",
blog(LOG_INFO, "dropping %" PRId64 " worth of frames",
buffer_duration_usec);
}
}