Attachment 177416 Details for Bug 214852 – Fix rtp stream

[patch] Fix rtp stream

patch-ffmpeg (text/plain), 2.80 KB, created by Kevin Lo on 2016-11-26 14:50:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Lo

Created: 2016-11-26 14:50:50 UTC

Size: 2.80 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 427170)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ffmpeg
> PORTVERSION=	2.8.8
>-PORTREVISION=	8
>+PORTREVISION=	9
> PORTEPOCH=	1
> CATEGORIES=	multimedia audio ipv6 net
> MASTER_SITES=	http://ffmpeg.org/releases/
>Index: files/patch-libavformat_rtsp.c
>===================================================================
>--- files/patch-libavformat_rtsp.c	(nonexistent)
>+++ files/patch-libavformat_rtsp.c	(working copy)
>@@ -0,0 +1,46 @@
>+--- libavformat/rtsp.c.orig	2016-11-26 14:15:14 UTC
>++++ libavformat/rtsp.c
>+@@ -1598,7 +1598,12 @@ int ff_rtsp_make_setup_request(AVFormatC
>+             }
>+             if (ttl > 0)
>+                 snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl);
>+-            getnameinfo((struct sockaddr*) &addr, sizeof(addr),
>++            getnameinfo((struct sockaddr*) &addr,
>++#ifdef __FreeBSD__
>++                        ((struct sockaddr*) &addr)->sa_len,
>++#else
>++                        sizeof(addr),
>++#endif
>+                         namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
>+             ff_url_join(url, sizeof(url), "rtp", NULL, namebuf,
>+                         port, "%s", optbuf);
>+@@ -1806,8 +1811,13 @@ redirect:
>+         goto fail;
>+     }
>+     if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) {
>+-        getnameinfo((struct sockaddr*) &peer, peer_len, host, sizeof(host),
>+-                    NULL, 0, NI_NUMERICHOST);
>++        getnameinfo((struct sockaddr*) &peer, 
>++#ifdef __FreeBSD__
>++                    ((struct sockaddr*) &peer)->sa_len,
>++#else
>++                    peer_len,            
>++#endif
>++		    host, sizeof(host), NULL, 0, NI_NUMERICHOST);
>+     }
>+ 
>+     /* request options supported by the server; this also detects server
>+@@ -2283,7 +2293,12 @@ static int sdp_read_header(AVFormatConte
>+         if (!(rt->rtsp_flags & RTSP_FLAG_CUSTOM_IO)) {
>+             AVDictionary *opts = map_to_opts(rt);
>+ 
>+-            getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip, sizeof(rtsp_st->sdp_ip),
>++            getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip,
>++#ifdef __FreeBSD__
>++                        ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len,
>++#else
>++                        sizeof(rtsp_st->sdp_ip),
>++#endif
>+                         namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
>+             ff_url_join(url, sizeof(url), "rtp", NULL,
>+                         namebuf, rtsp_st->sdp_port,
>
>Property changes on: files/patch-libavformat_rtsp.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 214852: 177416 | 177418