diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2016-12-03 18:51:10 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2016-12-03 18:51:10 +0000 |
| commit | 0101602007192180bae1d7e72733875935e64c0c (patch) | |
| tree | 90612275b71af92fe3930c511d72b2ceed224266 /multimedia/mplayer | |
| parent | Update dovecot2 to 2.2.27, and bump PORTREVISION on pigeonhole and (diff) | |
Port rtsp fixes from multimedia/ffmpeg changeset r427233
MFH: 2016Q4
Notes
Notes:
svn path=/head/; revision=427637
Diffstat (limited to 'multimedia/mplayer')
| -rw-r--r-- | multimedia/mplayer/Makefile.common | 2 | ||||
| -rw-r--r-- | multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c | 45 |
2 files changed, 46 insertions, 1 deletions
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common index 48349b29c38e..b5e3da33edc8 100644 --- a/multimedia/mplayer/Makefile.common +++ b/multimedia/mplayer/Makefile.common @@ -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} diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c b/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c new file mode 100644 index 000000000000..d1fc74ace2ee --- /dev/null +++ b/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c @@ -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)); |