Date: Sun, 27 Nov 2016 13:41:01 +0000 (UTC) From: Kevin Lo <kevlo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427233 - in head/multimedia/ffmpeg: . files Message-ID: <201611271341.uARDf1hn005516@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevlo Date: Sun Nov 27 13:41:00 2016 New Revision: 427233 URL: https://svnweb.freebsd.org/changeset/ports/427233 Log: Fix RTP stream; FreeBSD's socket calls require the sockaddr struct length to agree with the address family. PR: 214852 Submitted by: me Approved by: jbeich MFH: 2016Q4 Added: head/multimedia/ffmpeg/files/patch-libavformat_rtsp.c (contents, props changed) Modified: head/multimedia/ffmpeg/Makefile Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Sun Nov 27 12:57:15 2016 (r427232) +++ head/multimedia/ffmpeg/Makefile Sun Nov 27 13:41:00 2016 (r427233) @@ -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/ Added: head/multimedia/ffmpeg/files/patch-libavformat_rtsp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/ffmpeg/files/patch-libavformat_rtsp.c Sun Nov 27 13:41:00 2016 (r427233) @@ -0,0 +1,46 @@ +--- libavformat/rtsp.c.orig 2016-11-26 17:12: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, ++#if HAVE_STRUCT_SOCKADDR_SA_LEN ++ ((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, ++#if HAVE_STRUCT_SOCKADDR_SA_LEN ++ ((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, ++#if HAVE_STRUCT_SOCKADDR_SA_LEN ++ ((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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611271341.uARDf1hn005516>