multimedia/ffmpeg: update to 3.2.2

Changes:	https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n3.2.2:/Changelog
PR:		207547
Submitted by:	riggs, ebirth@b0ss.net (libressl fix)
Exp-run by:	antoine (3 tries)

10 files changed, 188 insertions, 182 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 09047e1abfe9..ca39ba09f7ac 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ffmpeg
-PORTVERSION=	2.8.8
-PORTREVISION=	9
+PORTVERSION=	3.2.2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -23,17 +22,17 @@ USE_LDCONFIG=	yes
 USE_PERL5=	build
 SHEBANG_FILES=	doc/texi2pod.pl
 
-PORTSCOUT=	limit:^2\.
+PORTSCOUT=	limit:^3\.
 
-OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \
-		DEBUG DOCS FAAC FDK_AAC FFSERVER FLITE FONTCONFIG \
+OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT DC1394 \
+		DEBUG DOCS EBUR128 FDK_AAC FFSERVER FLITE FONTCONFIG \
 		FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \
-		LAME LIBBLURAY MODPLUG OPENAL OPENCL OPENCV OPENGL \
-		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO QUVI \
-		RTCPU RTMP SCHROEDINGER SDL SMB SNAPPY SNDIO SPEEX SSH \
-		THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS VO_AACENC \
+		LAME LIBBLURAY MODPLUG NETCDF OPENAL OPENCL OPENCV OPENGL \
+		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \
+		RUBBERBAND RTCPU SCHROEDINGER SDL SMB SNAPPY SNDIO SPEEX SSH \
+		TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
 		VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \
-		XVIDEO ZMQ ZVBI
+		XVIDEO ZIMG ZMQ ZVBI
 
 OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
 			OPENCV RTCPU SCHROEDINGER THEORA V4L VAAPI VDPAU \
@@ -54,7 +53,9 @@ OPTIONS_DEFAULT_i386=	MMX SSE
 ASS_DESC=	Subtitles rendering via libass
 BS2B_DESC=	Bauer Stereophonic-to-Binaural filter
 CDIO_DESC=	Audio CD grabbing with libcdio
+CHROMAPRINT_DESC=	Audio fingerprinting with chromaprint
 DC1394_DESC=	IIDC-1394 grabbing using libdc1394
+EBUR128_DESC=	EBU R128 measurement for loudnorm filter
 FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
 FFSERVER_DESC=	Build and install ffserver
 FLITE_DESC=	Voice synthesis support via libflite
@@ -64,24 +65,23 @@ ILBC_DESC=	Internet Low Bit Rate codec
 KVAZAAR_DESC=	H.265 video codec support via Kvazaar
 LICENSE_DESC=	Licensing options
 NEON_DESC=	Enable Media Processing Engine instructions
+NETCDF_DESC=	SOFAlizer binaural filter
 NONFREE_DESC=	Allow use of nonfree code
 OPENH264_DESC=	H.264 video codec support via OpenH264
-QUVI_DESC=	Flash media stream URLs
+RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
 RTCPU_DESC=	Detect CPU capabilities at runtime
+LIBRTMP_DESC=	RTMP protocol support via librtmp
+TESSERACT_DESC=	Optical Character Recognition via Tesseract
 VFP_DESC=	Enable Vector Floating Point instructions
 VIDSTAB_DESC=	Video stabilization filter
 X11GRAB_DESC=	X11 grabbing (legacy)
 XCB_DESC=	X11 grabbing using XCB
+ZIMG_DESC=	"z" library video scaling filter
 ZMQ_DESC=	Message passing via libzmq${ZMQ_VERSION}
 ZVBI_DESC=	Teletext support via libzvbi
 
 OPTIONS_SUB=	yes
 
-# aacplus
-AACPLUS_LIB_DEPENDS=	libaacplus.so:audio/libaacplus
-AACPLUS_CONFIGURE_ENABLE=	libaacplus
-AACPLUS_IMPLIES=	NONFREE
-
 # alsa
 ALSA_CONFIGURE_OFF=	--disable-indev=alsa \
 			--disable-outdev=alsa
@@ -117,6 +117,11 @@ CDIO_CONFIGURE_ENABLE=	libcdio
 CELT_LIB_DEPENDS=	libcelt0.so:audio/celt
 CELT_CONFIGURE_ENABLE=	libcelt
 
+# chromaprint
+CHROMAPRINT_BROKEN=		Dependency loop
+CHROMAPRINT_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint
+CHROMAPRINT_CONFIGURE_ENABLE=	chromaprint
+
 # dc1394
 DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
 DC1394_CONFIGURE_ENABLE=	libdc1394
@@ -129,10 +134,9 @@ DEBUG_CONFIGURE_OFF=	--disable-debug
 DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
 DOCS_CONFIGURE_ENABLE=	htmlpages
 
-# faac
-FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
-FAAC_CONFIGURE_ENABLE=	libfaac
-FAAC_IMPLIES=		NONFREE
+# ebur128
+EBUR128_LIB_DEPENDS=	libebur128.so:audio/libebur128
+EBUR128_CONFIGURE_ENABLE=	libebur128
 
 # fdk_aac
 FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
@@ -163,6 +167,10 @@ FREI0R_CONFIGURE_ENABLE=	frei0r
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=	libfribidi
 
+# gcrypt
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
+GCRYPT_CONFIGURE_ENABLE=	gcrypt
+
 # gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=	gnutls
@@ -171,6 +179,11 @@ GNUTLS_CONFIGURE_ENABLE=	gnutls
 GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CONFIGURE_ENABLE=	libgme
 
+# gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
+GMP_CONFIGURE_ENABLE=	gmp
+GMP_IMPLIES=		GPL3
+
 # gsm
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CONFIGURE_ENABLE=	libgsm
@@ -218,6 +231,10 @@ MMX_CONFIGURE_ENABLE=	mmx
 MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	libmodplug
 
+# netcdf
+NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
+NETCDF_CONFIGURE_ENABLE=	netcdf
+
 # OpenAL
 OPENAL_LIB_DEPENDS=	libopenal.so:audio/openal-soft
 OPENAL_CONFIGURE_ENABLE=	openal
@@ -241,7 +258,7 @@ OPENH264_LIB_DEPENDS=	libopenh264.so:multimedia/openh264
 OPENH264_CONFIGURE_ENABLE=	libopenh264
 
 # openjpeg
-OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
 
 # openssl
@@ -262,25 +279,25 @@ PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
 PULSEAUDIO_CONFIGURE_OFF=	--disable-indev=pulse \
 				--disable-outdev=pulse
 
-# quvi
-QUVI_LIB_DEPENDS=	libquvi.so:multimedia/libquvi
-QUVI_CONFIGURE_ENABLE=	libquvi
+# rubberband
+RUBBERBAND_LIB_DEPENDS=	librubberband.so:audio/rubberband
+RUBBERBAND_CONFIGURE_ENABLE=	librubberband
 
 # rtcpu
 RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect
 
 # rtmp
-RTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
-RTMP_CONFIGURE_ENABLE=	librtmp
+LIBRTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
+LIBRTMP_CONFIGURE_ENABLE=	librtmp
 
 # schroedinger
 SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
 SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
 
 # sdl
-SDL_USE=		SDL=sdl
+SDL_USE=		SDL=sdl2
 SDL_CONFIGURE_ENABLE=	ffplay
-SDL_CONFIGURE_OFF=	--disable-outdev=sdl
+SDL_CONFIGURE_OFF=	--disable-outdev=sdl --disable-sdl2
 
 # smbclient
 SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
@@ -308,6 +325,10 @@ SSE_IMPLIES=		MMX
 SSH_LIB_DEPENDS=	libssh.so:security/libssh
 SSH_CONFIGURE_ENABLE=	libssh
 
+# tesseract
+TESSERACT_LIB_DEPENDS=	libtesseract.so:graphics/tesseract
+TESSERACT_CONFIGURE_ENABLE=	libtesseract
+
 # theora
 THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	libtheora
@@ -329,11 +350,6 @@ VFP_CONFIGURE_ENABLE=	vfp
 NEON_CONFIGURE_ENABLE=	neon
 NEON_CONFIGURE_ON=	--cpu=armv7-a
 
-# vo-aacenc
-VO_AACENC_LIB_DEPENDS=	libvo-aacenc.so:audio/vo-aacenc
-VO_AACENC_CONFIGURE_ENABLE=	libvo-aacenc
-VO_AACENC_IMPLIES=	GPL3
-
 # vo-amrwbenc
 VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:audio/vo-amrwbenc
 VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
@@ -384,6 +400,10 @@ XVID_CONFIGURE_ENABLE=	libxvid
 XVIDEO_USE=		XORG=xv
 XVIDEO_CONFIGURE_OFF=	--disable-outdev=xv
 
+# zimg
+ZIMG_LIB_DEPENDS=	libzimg.so:graphics/sekrit-twc-zimg
+ZIMG_CONFIGURE_ENABLE=	libzimg
+
 # zmq
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq${ZMQ_VERSION}
 ZMQ_CONFIGURE_ENABLE=	libzmq
@@ -422,8 +442,6 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 		--enable-avfilter \
 		--enable-avresample \
 		--enable-pthreads \
-		--disable-libstagefright-h264 \
-		--disable-libutvideo \
 		--disable-libsoxr \
 		--cc="${CC}" \
 		--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
@@ -455,17 +473,18 @@ post-patch:
 		s|gsm/gsm.h|gsm.h|g" \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|-ldl||' \
-		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
-		-e 's|freetype/freetype.h|freetype.h|g' \
+		-e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-patch-SDL-on:
 	@${REINPLACE_CMD} -E \
 		-e 's|sdl-config|${SDL_CONFIG}|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${FIND} ${WRKSRC} -type f | \
-		${XARGS} -n 10 ${REINPLACE_CMD} -E \
-		-e 's|#include <SDL|#include <SDL/SDL|'
+	@${REINPLACE_CMD} -E \
+		-e 's|#include <SDL|#include <SDL2/SDL|' \
+		${WRKSRC}/ffplay.c \
+		${WRKSRC}/libavdevice/opengl_enc.c \
+		${WRKSRC}/libavdevice/sdl2.c
 
 post-configure-THEORA-off:
 	@${REINPLACE_CMD} -E \
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 388cf1d3e526..7621e158ed99 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474303802
-SHA256 (ffmpeg-2.8.8.tar.bz2) = b70848958feadca180315d17b1131a1b519527971590e6ee8363a4c568ed06a6
-SIZE (ffmpeg-2.8.8.tar.bz2) = 8583641
+TIMESTAMP = 1480980538
+SHA256 (ffmpeg-3.2.2.tar.bz2) = 0b129a56d1b8d06101b1fcbfaa9f4f5eee3182d1ad6e44f511a84c12113a366b
+SIZE (ffmpeg-3.2.2.tar.bz2) = 9611373
diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index 89c28d8d1fb4..a706327f2952 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2015-06-19 20:47:55 UTC
+--- configure.orig	2016-10-27 16:17:39 UTC
 +++ configure
-@@ -2814,12 +2814,7 @@ target_os_default=$(tolower $(uname -s))
+@@ -3189,12 +3189,7 @@ target_os_default=$(tolower $(uname -s))
  host_os=$target_os_default
  
  # machine
@@ -14,20 +14,17 @@
  cpu="generic"
  intrinsics="none"
  
-@@ -5682,7 +5677,11 @@ elif enabled gcc; then
- elif enabled llvm_gcc; then
-     check_cflags -mllvm -stack-alignment=16
+@@ -6213,6 +6208,9 @@ elif enabled llvm_gcc; then
  elif enabled clang; then
--    check_cflags -mllvm -stack-alignment=16
+     check_cflags -mllvm -stack-alignment=16
+     check_cflags -mstack-alignment=16
 +    if enabled x86_32; then
-+        check_cflags -mllvm -stack-alignment=16
-+        check_cflags -mstack-alignment=16
 +        check_cflags -mstackrealign
 +    fi
      check_cflags -Qunused-arguments
      check_cflags -Werror=implicit-function-declaration
      check_cflags -Werror=missing-prototypes
-@@ -5823,7 +5818,7 @@ ifndef MAIN_MAKEFILE
+@@ -6562,7 +6560,7 @@ ifndef MAIN_MAKEFILE
  SRC_PATH:=\$(SRC_PATH:.%=..%)
  endif
  CC_IDENT=$cc_ident
@@ -36,7 +33,7 @@
  INTRINSICS=$intrinsics
  CC=$cc
  CXX=$cxx
-@@ -6035,7 +6030,7 @@ exec_prefix=\${prefix}
+@@ -6799,7 +6797,7 @@ exec_prefix=\${prefix}
  libdir=$libdir
  includedir=$incdir
  
@@ -45,7 +42,7 @@
  Description: $comment
  Version: $version
  Requires: $(enabled shared || echo $requires)
-@@ -6049,10 +6044,10 @@ EOF
+@@ -6813,10 +6811,10 @@ EOF
  mkdir -p doc/examples/pc-uninstalled
  includedir=${source_path}
  [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
diff --git a/multimedia/ffmpeg/files/patch-kvazaar-0.7 b/multimedia/ffmpeg/files/patch-kvazaar-0.7
deleted file mode 100644
index 77e1e9da56b7..000000000000
--- a/multimedia/ffmpeg/files/patch-kvazaar-0.7
+++ /dev/null
@@ -1,73 +0,0 @@
-From b3777b2c2eb5d04386992c0388985914d5bbebba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arttu=20Yl=C3=A4-Outinen?= <arttu.yla-outinen@tut.fi>
-Date: Mon, 28 Sep 2015 10:55:14 +0300
-Subject: libkvazaar: Update to work with the latest version
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Function encoder_encode in Kvazaar API was changed to have new output
-parameters: source picture and frame info. Frame info is used to set the
-keyframe flag and source picture is ignored.
-
-Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
----
- libavcodec/libkvazaar.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git configure configure
-index 4cc45ad..af3fbf4 100755
---- configure
-+++ configure
-@@ -5237,7 +5237,7 @@
-                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
-                                done || die "ERROR: libgsm not found"; }
- enabled libilbc           && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
--enabled libkvazaar        && require_pkg_config "kvazaar < 0.7.0" kvazaar.h kvz_api_get
-+enabled libkvazaar        && require_pkg_config "kvazaar >= 0.7.0" kvazaar.h kvz_api_get
- enabled libmfx            && require_pkg_config libmfx "mfx/mfxvideo.h" MFXInit
- enabled libmodplug        && require_pkg_config libmodplug libmodplug/modplug.h ModPlug_Load
- enabled libmp3lame        && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
-diff --git libavcodec/libkvazaar.c libavcodec/libkvazaar.c
-index 9fb5be7..7430e0a 100644
---- libavcodec/libkvazaar.c
-+++ libavcodec/libkvazaar.c
-@@ -137,8 +137,11 @@ static int libkvazaar_encode(AVCodecContext *avctx,
- {
-     int retval = 0;
-     kvz_picture *img_in = NULL;
-+
-     kvz_data_chunk *data_out = NULL;
-     uint32_t len_out = 0;
-+    kvz_frame_info frame_info;
-+
-     LibkvazaarContext *ctx = avctx->priv_data;
- 
-     *got_packet_ptr = 0;
-@@ -173,7 +176,10 @@ static int libkvazaar_encode(AVCodecContext *avctx,
-         }
-     }
- 
--    if (!ctx->api->encoder_encode(ctx->encoder, img_in, &data_out, &len_out, NULL)) {
-+    if (!ctx->api->encoder_encode(ctx->encoder, img_in,
-+                                  &data_out, &len_out,
-+                                  NULL, NULL,
-+                                  &frame_info)) {
-         av_log(avctx, AV_LOG_ERROR, "Failed to encode frame.\n");
-         retval = AVERROR_EXTERNAL;
-         goto done;
-@@ -198,6 +204,14 @@ static int libkvazaar_encode(AVCodecContext *avctx,
- 
-         ctx->api->chunk_free(data_out);
-         data_out = NULL;
-+
-+        avpkt->flags = 0;
-+        // IRAP VCL NAL unit types span the range
-+        // [BLA_W_LP (16), RSV_IRAP_VCL23 (23)].
-+        if (frame_info.nal_unit_type >= KVZ_NAL_BLA_W_LP &&
-+                frame_info.nal_unit_type <= KVZ_NAL_RSV_IRAP_VCL23) {
-+            avpkt->flags |= AV_PKT_FLAG_KEY;
-+        }
-     }
- 
- done:
diff --git a/multimedia/ffmpeg/files/patch-libavcodec-Makefile b/multimedia/ffmpeg/files/patch-libavcodec-Makefile
index 32f70f0b34f2..254907a12027 100644
--- a/multimedia/ffmpeg/files/patch-libavcodec-Makefile
+++ b/multimedia/ffmpeg/files/patch-libavcodec-Makefile
@@ -1,9 +1,9 @@
---- libavcodec/Makefile.orig	2015-06-19 20:44:36 UTC
+--- libavcodec/Makefile.orig	2016-02-15 02:29:38 UTC
 +++ libavcodec/Makefile
-@@ -877,7 +877,7 @@ SKIPHEADERS                            +
-                                           old_codec_ids.h               \
-                                           tableprint.h                  \
-                                           tableprint_vlc.h              \
+@@ -935,7 +935,7 @@ SKIPHEADERS                            +
+                                           aaccoder_trellis.h            \
+                                           aacenc_quantization.h         \
+                                           aacenc_quantization_misc.h    \
 -                                          $(ARCH)/vp56_arith.h          \
 +                                          $(FFMPEG_ARCH)/vp56_arith.h          \
  
diff --git a/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c b/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
deleted file mode 100644
index 815ef144c894..000000000000
--- a/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libavfilter/vf_libopencv.c.orig	2015-06-19 20:44:50 UTC
-+++ libavfilter/vf_libopencv.c
-@@ -23,8 +23,7 @@
-  * libopencv wrapper functions
-  */
- 
--#include <opencv/cv.h>
--#include <opencv/cxcore.h>
-+#include <opencv2/imgproc/imgproc_c.h>
- #include "libavutil/avstring.h"
- #include "libavutil/common.h"
- #include "libavutil/file.h"
diff --git a/multimedia/ffmpeg/files/patch-libavformat_rtsp.c b/multimedia/ffmpeg/files/patch-libavformat_rtsp.c
index b21db5259c30..7cd751dbd79c 100644
--- a/multimedia/ffmpeg/files/patch-libavformat_rtsp.c
+++ b/multimedia/ffmpeg/files/patch-libavformat_rtsp.c
@@ -1,6 +1,6 @@
---- libavformat/rtsp.c.orig	2016-11-26 17:12:14 UTC
+--- libavformat/rtsp.c.orig	2016-10-27 16:17:40 UTC
 +++ libavformat/rtsp.c
-@@ -1598,7 +1598,12 @@ int ff_rtsp_make_setup_request(AVFormatC
+@@ -1614,7 +1614,12 @@ int ff_rtsp_make_setup_request(AVFormatC
              }
              if (ttl > 0)
                  snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl);
@@ -14,33 +14,31 @@
                          namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
              ff_url_join(url, sizeof(url), "rtp", NULL, namebuf,
                          port, "%s", optbuf);
-@@ -1806,8 +1811,13 @@ redirect:
+@@ -1830,8 +1835,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, 
++        getnameinfo((struct sockaddr*) &peer,
 +#if HAVE_STRUCT_SOCKADDR_SA_LEN
 +                    ((struct sockaddr*) &peer)->sa_len,
 +#else
-+                    peer_len,            
++                    peer_len,
 +#endif
-+		    host, sizeof(host), NULL, 0, NI_NUMERICHOST);
++                    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)) {
+@@ -2310,7 +2320,11 @@ static int sdp_read_header(AVFormatConte
              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,
+             err = getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip,
 +#if HAVE_STRUCT_SOCKADDR_SA_LEN
-+                        ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len,
++                              ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len,
 +#else
-+                        sizeof(rtsp_st->sdp_ip),
+                               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,
+                               namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
+             if (err) {
+                 av_log(s, AV_LOG_ERROR, "getnameinfo: %s\n", gai_strerror(err));
diff --git a/multimedia/ffmpeg/files/patch-libavformat_tls__openssl.c b/multimedia/ffmpeg/files/patch-libavformat_tls__openssl.c
new file mode 100644
index 000000000000..3912df49ba4d
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-libavformat_tls__openssl.c
@@ -0,0 +1,56 @@
+--- libavformat/tls_openssl.c.orig	2016-10-27 16:17:40 UTC
++++ libavformat/tls_openssl.c
+@@ -43,7 +43,7 @@ typedef struct TLSContext {
+     TLSShared tls_shared;
+     SSL_CTX *ctx;
+     SSL *ssl;
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+     BIO_METHOD* url_bio_method;
+ #endif
+ } TLSContext;
+@@ -68,7 +68,7 @@ static unsigned long openssl_thread_id(v
+ 
+ static int url_bio_create(BIO *b)
+ {
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+     BIO_set_init(b, 1);
+     BIO_set_data(b, NULL);
+     BIO_set_flags(b, 0);
+@@ -85,7 +85,7 @@ static int url_bio_destroy(BIO *b)
+     return 1;
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+ #define GET_BIO_DATA(x) BIO_get_data(x);
+ #else
+ #define GET_BIO_DATA(x) (x)->ptr;
+@@ -133,7 +133,7 @@ static int url_bio_bputs(BIO *b, const c
+     return url_bio_bwrite(b, str, strlen(str));
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
+ static BIO_METHOD url_bio_method = {
+     .type = BIO_TYPE_SOURCE_SINK,
+     .name = "urlprotocol bio",
+@@ -212,7 +212,7 @@ static int tls_close(URLContext *h)
+         SSL_CTX_free(c->ctx);
+     if (c->tls_shared.tcp)
+         ffurl_close(c->tls_shared.tcp);
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+     if (c->url_bio_method)
+         BIO_meth_free(c->url_bio_method);
+ #endif
+@@ -265,7 +265,7 @@ static int tls_open(URLContext *h, const
+         ret = AVERROR(EIO);
+         goto fail;
+     }
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+     p->url_bio_method = BIO_meth_new(BIO_TYPE_SOURCE_SINK, "urlprotocol bio");
+     BIO_meth_set_write(p->url_bio_method, url_bio_bwrite);
+     BIO_meth_set_read(p->url_bio_method, url_bio_bread);
diff --git a/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile b/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile
new file mode 100644
index 000000000000..22d0ac59003d
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile
@@ -0,0 +1,11 @@
+--- tests/checkasm/Makefile.orig	2016-10-01 01:12:42 UTC
++++ tests/checkasm/Makefile
+@@ -24,7 +24,7 @@ AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER)
+ CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
+ 
+ 
+--include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile
++-include $(SRC_PATH)/tests/checkasm/$(FFMPEG_ARCH)/Makefile
+ 
+ CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o
+ CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))
diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist
index 8977dbd2a939..4eb265db8350 100644
--- a/multimedia/ffmpeg/pkg-plist
+++ b/multimedia/ffmpeg/pkg-plist
@@ -4,11 +4,14 @@ bin/ffprobe
 %%FFSERVER%%bin/ffserver
 %%FFSERVER%%@sample etc/ffserver.conf.sample
 include/libavcodec/avcodec.h
+include/libavcodec/avdct.h
 include/libavcodec/avfft.h
 include/libavcodec/d3d11va.h
+include/libavcodec/dirac.h
 include/libavcodec/dv_profile.h
 include/libavcodec/dxva2.h
-include/libavcodec/old_codec_ids.h
+include/libavcodec/jni.h
+include/libavcodec/mediacodec.h
 include/libavcodec/qsv.h
 include/libavcodec/vaapi.h
 include/libavcodec/vda.h
@@ -19,8 +22,6 @@ include/libavcodec/vorbis_parser.h
 include/libavcodec/xvmc.h
 include/libavdevice/avdevice.h
 include/libavdevice/version.h
-include/libavfilter/asrc_abuffer.h
-include/libavfilter/avcodec.h
 include/libavfilter/avfilter.h
 include/libavfilter/avfiltergraph.h
 include/libavfilter/buffersink.h
@@ -33,9 +34,9 @@ include/libavresample/avresample.h
 include/libavresample/version.h
 include/libavutil/adler32.h
 include/libavutil/aes.h
+include/libavutil/aes_ctr.h
 include/libavutil/attributes.h
 include/libavutil/audio_fifo.h
-include/libavutil/audioconvert.h
 include/libavutil/avassert.h
 include/libavutil/avconfig.h
 include/libavutil/avstring.h
@@ -51,6 +52,7 @@ include/libavutil/channel_layout.h
 include/libavutil/common.h
 include/libavutil/cpu.h
 include/libavutil/crc.h
+include/libavutil/des.h
 include/libavutil/dict.h
 include/libavutil/display.h
 include/libavutil/downmix_info.h
@@ -62,6 +64,12 @@ include/libavutil/file.h
 include/libavutil/frame.h
 include/libavutil/hash.h
 include/libavutil/hmac.h
+include/libavutil/hwcontext.h
+include/libavutil/hwcontext_cuda.h
+include/libavutil/hwcontext_dxva2.h
+include/libavutil/hwcontext_qsv.h
+include/libavutil/hwcontext_vaapi.h
+include/libavutil/hwcontext_vdpau.h
 include/libavutil/imgutils.h
 include/libavutil/intfloat.h
 include/libavutil/intreadwrite.h
@@ -69,12 +77,12 @@ include/libavutil/lfg.h
 include/libavutil/log.h
 include/libavutil/lzo.h
 include/libavutil/macros.h
+include/libavutil/mastering_display_metadata.h
 include/libavutil/mathematics.h
 include/libavutil/md5.h
 include/libavutil/mem.h
 include/libavutil/motion_vector.h
 include/libavutil/murmur3.h
-include/libavutil/old_pix_fmts.h
 %%OPENCL%%include/libavutil/opencl.h
 include/libavutil/opt.h
 include/libavutil/parseutils.h
@@ -83,6 +91,7 @@ include/libavutil/pixelutils.h
 include/libavutil/pixfmt.h
 include/libavutil/random_seed.h
 include/libavutil/rational.h
+include/libavutil/rc4.h
 include/libavutil/replaygain.h
 include/libavutil/ripemd.h
 include/libavutil/samplefmt.h
@@ -94,6 +103,7 @@ include/libavutil/threadmessage.h
 include/libavutil/time.h
 include/libavutil/timecode.h
 include/libavutil/timestamp.h
+include/libavutil/tree.h
 include/libavutil/twofish.h
 include/libavutil/version.h
 include/libavutil/xtea.h
@@ -105,40 +115,40 @@ include/libswscale/swscale.h
 include/libswscale/version.h
 lib/libavcodec.a
 lib/libavcodec.so
-lib/libavcodec.so.56
-lib/libavcodec.so.56.60.100
+lib/libavcodec.so.57
+lib/libavcodec.so.57.64.101
 lib/libavdevice.a
 lib/libavdevice.so
-lib/libavdevice.so.56
-lib/libavdevice.so.56.4.100
+lib/libavdevice.so.57
+lib/libavdevice.so.57.1.100
 lib/libavfilter.a
 lib/libavfilter.so
-lib/libavfilter.so.5
-lib/libavfilter.so.5.40.101
+lib/libavfilter.so.6
+lib/libavfilter.so.6.65.100
 lib/libavformat.a
 lib/libavformat.so
-lib/libavformat.so.56
-lib/libavformat.so.56.40.101
+lib/libavformat.so.57
+lib/libavformat.so.57.56.100
 lib/libavresample.a
 lib/libavresample.so
-lib/libavresample.so.2
-lib/libavresample.so.2.1.0
+lib/libavresample.so.3
+lib/libavresample.so.3.1.0
 lib/libavutil.a
 lib/libavutil.so
-lib/libavutil.so.54
-lib/libavutil.so.54.31.100
+lib/libavutil.so.55
+lib/libavutil.so.55.34.100
 lib/libpostproc.a
 lib/libpostproc.so
-lib/libpostproc.so.53
-lib/libpostproc.so.53.3.100
+lib/libpostproc.so.54
+lib/libpostproc.so.54.1.100
 lib/libswresample.a
 lib/libswresample.so
-lib/libswresample.so.1
-lib/libswresample.so.1.2.101
+lib/libswresample.so.2
+lib/libswresample.so.2.3.100
 lib/libswscale.a
 lib/libswscale.so
-lib/libswscale.so.3
-lib/libswscale.so.3.1.101
+lib/libswscale.so.4
+lib/libswscale.so.4.2.100
 libdata/pkgconfig/libavcodec.pc
 libdata/pkgconfig/libavdevice.pc
 libdata/pkgconfig/libavfilter.pc