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

obs-outputs: Fix a few warnings in librtmp

master
jp9000 2016-02-07 15:32:02 -08:00
parent a6c8a923e9
commit 867c58472e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/obs-outputs/librtmp/handshake.h
View File

@ -198,6 +198,8 @@ GetDigestOffset2(uint8_t *handshake, unsigned int len)
__FUNCTION__, res); __FUNCTION__, res);
exit(1); exit(1);
} }
(void)len;
return res; return res;
} }
@ -764,7 +766,9 @@ HandShake(RTMP * r, int FP9HandShake)
RC4_handle keyIn = 0; RC4_handle keyIn = 0;
RC4_handle keyOut = 0; RC4_handle keyOut = 0;
#ifndef _DEBUG
int32_t *ip; int32_t *ip;
#endif
uint32_t uptime; uint32_t uptime;
uint8_t clientbuf[RTMP_SIG_SIZE + 4], *clientsig=clientbuf+4; uint8_t clientbuf[RTMP_SIG_SIZE + 4], *clientsig=clientbuf+4;
@ -1139,7 +1143,10 @@ SHandShake(RTMP * r)
RC4_handle keyOut = 0; RC4_handle keyOut = 0;
int FP9HandShake = FALSE; int FP9HandShake = FALSE;
int encrypted; int encrypted;
#ifndef _DEBUG
int32_t *ip; int32_t *ip;
#endif
uint8_t clientsig[RTMP_SIG_SIZE]; uint8_t clientsig[RTMP_SIG_SIZE];
uint8_t serverbuf[RTMP_SIG_SIZE + 4], *serversig = serverbuf+4; uint8_t serverbuf[RTMP_SIG_SIZE + 4], *serversig = serverbuf+4;

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

@ -1384,7 +1384,7 @@ WriteN(RTMP *r, const char *buffer, int n)
if (r->Link.rc4keyOut) if (r->Link.rc4keyOut)
{ {
if (n > sizeof(buf)) if (n > (int)sizeof(buf))
encrypted = (char *)malloc(n); encrypted = (char *)malloc(n);
else else
encrypted = (char *)buf; encrypted = (char *)buf;
@ -2344,6 +2344,8 @@ AV_clear(RTMP_METHOD *vals, int num)
static int static int
b64enc(const unsigned char *input, int length, char *output, int maxsize) b64enc(const unsigned char *input, int length, char *output, int maxsize)
{ {
(void)maxsize;
#ifdef USE_POLARSSL #ifdef USE_POLARSSL
size_t buf_size = maxsize; size_t buf_size = maxsize;
if(base64_encode((unsigned char *) output, &buf_size, input, length) == 0) if(base64_encode((unsigned char *) output, &buf_size, input, length) == 0)