Date: Sat, 3 Dec 2016 18:51:10 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427637 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <201612031851.uB3IpAee049809@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Dec 3 18:51:10 2016 New Revision: 427637 URL: https://svnweb.freebsd.org/changeset/ports/427637 Log: Port rtsp fixes from multimedia/ffmpeg changeset r427233 MFH: 2016Q4 Added: head/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c (contents, props changed) Modified: head/multimedia/mencoder/Makefile head/multimedia/mplayer/Makefile.common Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Sat Dec 3 18:31:35 2016 (r427636) +++ head/multimedia/mencoder/Makefile Sat Dec 3 18:51:10 2016 (r427637) @@ -3,7 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org Modified: head/multimedia/mplayer/Makefile.common ============================================================================== --- head/multimedia/mplayer/Makefile.common Sat Dec 3 18:31:35 2016 (r427636) +++ head/multimedia/mplayer/Makefile.common Sat Dec 3 18:51:10 2016 (r427637) @@ -6,7 +6,7 @@ MPLAYER_PORT_VERSION= 1.3.0 MPLAYER_SNAPSHOT_DATE= 2016-09-12 -PORTREVISION?= 2 +PORTREVISION?= 3 MASTER_SITES= LOCAL/riggs/mplayer DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} Added: head/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c Sat Dec 3 18:51:10 2016 (r427637) @@ -0,0 +1,45 @@ +--- ffmpeg/libavformat/rtsp.c.orig 2016-08-05 16:20:04 UTC ++++ ffmpeg/libavformat/rtsp.c +@@ -1613,7 +1613,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); +@@ -1829,8 +1834,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 +@@ -2309,7 +2319,11 @@ static int sdp_read_header(AVFormatConte + AVDictionary *opts = map_to_opts(rt); + + err = getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip, +- sizeof(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); + if (err) { + av_log(s, AV_LOG_ERROR, "getnameinfo: %s\n", gai_strerror(err));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612031851.uB3IpAee049809>