Sergio Ammirata
2018-12-07 14:21:30 UTC
vlc | branch: master | Sergio Ammirata <***@ammirata.net> | Wed Nov 28 06:52:53 2018 -0500| [f487da48e6433a342e14e614c4c29f8a8d6ad310] | committer: Thomas Guillem
access_out: rist: use ssize_t to match the return value of rist_Read
modules/access_output/rist.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/access_output/rist.c b/modules/access_output/rist.c
index d46f170d39..5ce799b14e 100644
--- a/modules/access_output/rist.c
+++ b/modules/access_output/rist.c
@@ -384,7 +384,7 @@ static void *rist_thread(void *data)
uint8_t pkt[RTP_PKT_SIZE];
struct pollfd pfd[1];
int ret;
- int r;
+ ssize_t r;
pfd[0].fd = p_sys->flow->fd_rtcp;
pfd[0].events = POLLIN;
@@ -398,7 +398,7 @@ static void *rist_thread(void *data)
{
r = rist_Read(p_sys->flow->fd_rtcp, pkt, RTP_PKT_SIZE);
if (r == RTP_PKT_SIZE) {
- msg_Err(p_access, "Rist RTCP messsage is too big (%d bytes) and was probably " \
+ msg_Err(p_access, "Rist RTCP messsage is too big (%zd bytes) and was probably " \
"cut, please keep it under %d bytes", r, RTP_PKT_SIZE);
}
if (unlikely(r == -1)) {
access_out: rist: use ssize_t to match the return value of rist_Read
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f487da48e6433a342e14e614c4c29f8a8d6ad310
---modules/access_output/rist.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/access_output/rist.c b/modules/access_output/rist.c
index d46f170d39..5ce799b14e 100644
--- a/modules/access_output/rist.c
+++ b/modules/access_output/rist.c
@@ -384,7 +384,7 @@ static void *rist_thread(void *data)
uint8_t pkt[RTP_PKT_SIZE];
struct pollfd pfd[1];
int ret;
- int r;
+ ssize_t r;
pfd[0].fd = p_sys->flow->fd_rtcp;
pfd[0].events = POLLIN;
@@ -398,7 +398,7 @@ static void *rist_thread(void *data)
{
r = rist_Read(p_sys->flow->fd_rtcp, pkt, RTP_PKT_SIZE);
if (r == RTP_PKT_SIZE) {
- msg_Err(p_access, "Rist RTCP messsage is too big (%d bytes) and was probably " \
+ msg_Err(p_access, "Rist RTCP messsage is too big (%zd bytes) and was probably " \
"cut, please keep it under %d bytes", r, RTP_PKT_SIZE);
}
if (unlikely(r == -1)) {