svn commit: r427878 - in branches/2016Q4/multimedia: mencoder mplayer mplayer/files

[Thomas Zander]

Author: riggs
Date: Mon Dec  5 12:21:55 2016
New Revision: 427878
URL: https://svnweb.freebsd.org/changeset/ports/427878

Log:
  MFH: r427637
  
  Port rtsp fixes from multimedia/ffmpeg changeset r427233
  
  Approved by:	ports-secteam (junovitch)

Added:
  branches/2016Q4/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c
     - copied unchanged from r427637, head/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c
Modified:
  branches/2016Q4/multimedia/mencoder/Makefile
  branches/2016Q4/multimedia/mplayer/Makefile.common
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/multimedia/mencoder/Makefile
==============================================================================
--- branches/2016Q4/multimedia/mencoder/Makefile	Mon Dec  5 11:19:45 2016	(r427877)
+++ branches/2016Q4/multimedia/mencoder/Makefile	Mon Dec  5 12:21:55 2016	(r427878)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs at FreeBSD.org

Modified: branches/2016Q4/multimedia/mplayer/Makefile.common
==============================================================================
--- branches/2016Q4/multimedia/mplayer/Makefile.common	Mon Dec  5 11:19:45 2016	(r427877)
+++ branches/2016Q4/multimedia/mplayer/Makefile.common	Mon Dec  5 12:21:55 2016	(r427878)
@@ -6,7 +6,7 @@
 
 MPLAYER_PORT_VERSION=	1.3.0
 MPLAYER_SNAPSHOT_DATE=	2016-09-12
-PORTREVISION?=	1
+PORTREVISION?=	3
 MASTER_SITES=	LOCAL/riggs/mplayer
 DISTNAME=	mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
 WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}

Copied: branches/2016Q4/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c (from r427637, head/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q4/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c	Mon Dec  5 12:21:55 2016	(r427878, copy of r427637, head/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));