version 3.2:

- libopenmpt demuxer
- tee protocol
- Changed metadata print option to accept general urls
- Alias muxer for Ogg Video (.ogv)
- VP8 in Ogg muxing
- curves filter doesn't automatically insert points at x=0 and x=1 anymore
- 16-bit support in curves filter and selectivecolor filter
- OpenH264 decoder wrapper
- MediaCodec H.264/HEVC/MPEG-4/VP8/VP9 hwaccel
- True Audio (TTA) muxer
- crystalizer audio filter
- acrusher audio filter
- bitplanenoise video filter
- floating point support in als decoder
- fifo muxer
- maskedclamp filter
- hysteresis filter
- lut2 filter
- yuvtestsrc filter
- CUDA CUVID H.263/VP8/VP9/10 bit HEVC (Dithered) Decoding
- vaguedenoiser filter
- added threads option per filter instance
- weave filter
- gblur filter
- avgblur filter
- sobel and prewitt filter
- MediaCodec HEVC/MPEG-4/VP8/VP9 decoding
- Meridian Lossless Packing (MLP) / TrueHD encoder
- Non-Local Means (nlmeans) denoising filter
- sdl2 output device and ffplay support
- sdl1 output device and sdl1 support removed
- extended mov edit list support
- libfaac encoder removed
- Matroska muxer now writes CRC32 elements by default in all Level 1 elements
- sidedata video and asidedata audio filter
- Changed mapping of rtp MIME type G726 to codec g726le.

5 files changed, 31 insertions, 53 deletions

diff --git a/multimedia/ffmpeg3/Makefile.common b/multimedia/ffmpeg3/Makefile.common
index f1b0f431a65..144727f0f12 100644
--- a/multimedia/ffmpeg3/Makefile.common
+++ b/multimedia/ffmpeg3/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.11 2016/10/24 10:17:55 maya Exp $
+# $NetBSD: Makefile.common,v 1.12 2016/10/28 19:15:06 adam Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
-DISTNAME=	ffmpeg-3.1.5
+DISTNAME=	ffmpeg-3.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/ffmpeg3/PLIST b/multimedia/ffmpeg3/PLIST
index 3a071815e70..c8b88909cf1 100644
--- a/multimedia/ffmpeg3/PLIST
+++ b/multimedia/ffmpeg3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/07/02 12:30:16 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/10/28 19:15:06 adam Exp $
 bin/ffmpeg3
 bin/ffprobe3
 bin/ffserver3
@@ -10,6 +10,7 @@ include/ffmpeg3/libavcodec/dirac.h
 include/ffmpeg3/libavcodec/dv_profile.h
 include/ffmpeg3/libavcodec/dxva2.h
 include/ffmpeg3/libavcodec/jni.h
+include/ffmpeg3/libavcodec/mediacodec.h
 include/ffmpeg3/libavcodec/qsv.h
 include/ffmpeg3/libavcodec/vaapi.h
 include/ffmpeg3/libavcodec/vda.h
@@ -63,6 +64,7 @@ include/ffmpeg3/libavutil/hmac.h
 include/ffmpeg3/libavutil/hwcontext.h
 include/ffmpeg3/libavutil/hwcontext_cuda.h
 include/ffmpeg3/libavutil/hwcontext_dxva2.h
+include/ffmpeg3/libavutil/hwcontext_qsv.h
 include/ffmpeg3/libavutil/hwcontext_vaapi.h
 include/ffmpeg3/libavutil/hwcontext_vdpau.h
 include/ffmpeg3/libavutil/imgutils.h
@@ -111,35 +113,35 @@ include/ffmpeg3/libswscale/version.h
 lib/ffmpeg3/libavcodec.a
 lib/ffmpeg3/libavcodec.so
 lib/ffmpeg3/libavcodec.so.57
-lib/ffmpeg3/libavcodec.so.57.48.101
+lib/ffmpeg3/libavcodec.so.57.64.100
 lib/ffmpeg3/libavdevice.a
 lib/ffmpeg3/libavdevice.so
 lib/ffmpeg3/libavdevice.so.57
-lib/ffmpeg3/libavdevice.so.57.0.101
+lib/ffmpeg3/libavdevice.so.57.1.100
 lib/ffmpeg3/libavfilter.a
 lib/ffmpeg3/libavfilter.so
 lib/ffmpeg3/libavfilter.so.6
-lib/ffmpeg3/libavfilter.so.6.47.100
+lib/ffmpeg3/libavfilter.so.6.65.100
 lib/ffmpeg3/libavformat.a
 lib/ffmpeg3/libavformat.so
 lib/ffmpeg3/libavformat.so.57
-lib/ffmpeg3/libavformat.so.57.41.100
+lib/ffmpeg3/libavformat.so.57.56.100
 lib/ffmpeg3/libavutil.a
 lib/ffmpeg3/libavutil.so
 lib/ffmpeg3/libavutil.so.55
-lib/ffmpeg3/libavutil.so.55.28.100
+lib/ffmpeg3/libavutil.so.55.34.100
 lib/ffmpeg3/libpostproc.a
 lib/ffmpeg3/libpostproc.so
 lib/ffmpeg3/libpostproc.so.54
-lib/ffmpeg3/libpostproc.so.54.0.100
+lib/ffmpeg3/libpostproc.so.54.1.100
 lib/ffmpeg3/libswresample.a
 lib/ffmpeg3/libswresample.so
 lib/ffmpeg3/libswresample.so.2
-lib/ffmpeg3/libswresample.so.2.1.100
+lib/ffmpeg3/libswresample.so.2.3.100
 lib/ffmpeg3/libswscale.a
 lib/ffmpeg3/libswscale.so
 lib/ffmpeg3/libswscale.so.4
-lib/ffmpeg3/libswscale.so.4.1.100
+lib/ffmpeg3/libswscale.so.4.2.100
 lib/ffmpeg3/pkgconfig/libavcodec.pc
 lib/ffmpeg3/pkgconfig/libavdevice.pc
 lib/ffmpeg3/pkgconfig/libavfilter.pc
@@ -195,6 +197,7 @@ share/doc/ffmpeg3/filter_design.txt
 ${PLIST.doc}share/doc/ffmpeg3/general.html
 ${PLIST.doc}share/doc/ffmpeg3/git-howto.html
 share/doc/ffmpeg3/issue_tracker.txt
+share/doc/ffmpeg3/libav-merge.txt
 ${PLIST.doc}share/doc/ffmpeg3/libavcodec.html
 ${PLIST.doc}share/doc/ffmpeg3/libavdevice.html
 ${PLIST.doc}share/doc/ffmpeg3/libavfilter.html
diff --git a/multimedia/ffmpeg3/distinfo b/multimedia/ffmpeg3/distinfo
index 30b03021632..b940581872d 100644
--- a/multimedia/ffmpeg3/distinfo
+++ b/multimedia/ffmpeg3/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.11 2016/10/24 10:17:55 maya Exp $
+$NetBSD: distinfo,v 1.12 2016/10/28 19:15:06 adam Exp $
 
-SHA1 (ffmpeg-3.1.5.tar.bz2) = 053dfea8c9e057fdf237885decd03147cb2412b1
-RMD160 (ffmpeg-3.1.5.tar.bz2) = 31343332f9130a9405127c7f10575bd3f5f8149a
-SHA512 (ffmpeg-3.1.5.tar.bz2) = 9d22d48318cf6d44ce3a4d2ee57fa51d04c685a1c72e9668f5ad4443d246a33108f66f1dc9106e1c4db52b6c2c267b6682b9b7c3d267e4c37e4460f4169b97d1
-Size (ffmpeg-3.1.5.tar.bz2) = 9334190 bytes
+SHA1 (ffmpeg-3.2.tar.bz2) = aac4876d1bc4d2cd8d9833b20649c3eed984f6ef
+RMD160 (ffmpeg-3.2.tar.bz2) = 0d6d52f5969eb98c535f233c4639134eb1ef70d6
+SHA512 (ffmpeg-3.2.tar.bz2) = 025caee069709e4d5281033c95c5dcb1a8d8928da98f5a5e55734577852f960668d9a1df2a059e9b800ad2bf2b53c7d1ea6655ccdc0e14281fbcc45f2ae7a1bb
+Size (ffmpeg-3.2.tar.bz2) = 9605348 bytes
 SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56
-SHA1 (patch-configure) = b881b648812f96cfd772e6a5de69db98adc08303
+SHA1 (patch-configure) = d5143d12a1e2baaa8a27019e55294756c3babab1
 SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a
 SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2
-SHA1 (patch-libavutil_x86_asm.h) = 85c5403e97449639253d3c97391dfbb4cadb2548
+SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22
 SHA1 (patch-libavutil_x86_cpu.c) = 499b0fc3081971a2bba2724bd051aab14c531239
diff --git a/multimedia/ffmpeg3/patches/patch-configure b/multimedia/ffmpeg3/patches/patch-configure
index 5c3d4399550..595a3419311 100644
--- a/multimedia/ffmpeg3/patches/patch-configure
+++ b/multimedia/ffmpeg3/patches/patch-configure
@@ -1,17 +1,8 @@
-$NetBSD: patch-configure,v 1.2 2016/08/03 12:06:15 maya Exp $
+$NetBSD: patch-configure,v 1.3 2016/10/28 19:15:06 adam Exp $
 
---- configure.orig	2016-06-26 23:54:28.000000000 +0000
+--- configure.orig	2016-10-27 16:17:39.000000000 +0000
 +++ configure
-@@ -4201,7 +4201,7 @@ case "$arch" in
-     sh4|sh)
-         arch="sh4"
-     ;;
--    sun4u|sparc*)
-+    sun4*|sparc*)
-         arch="sparc"
-     ;;
-     tilegx|tile-gx)
-@@ -4631,6 +4631,11 @@ case $target_os in
+@@ -4676,6 +4676,11 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -23,7 +14,7 @@ $NetBSD: patch-configure,v 1.2 2016/08/03 12:06:15 maya Exp $
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -5089,10 +5094,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -5138,10 +5143,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF
  
@@ -40,23 +31,7 @@ $NetBSD: patch-configure,v 1.2 2016/08/03 12:06:15 maya Exp $
  
  if ! enabled ppc64 || enabled bigendian; then
      disable vsx
-@@ -6041,6 +6049,7 @@ enabled xmm_clobber_test &&
-                   -Wl,--wrap,sws_scale ||
-     disable xmm_clobber_test
- 
-+if false; then
- echo "X { local: *; };" > $TMPV
- if test_ldflags -Wl,--version-script,$TMPV; then
-     append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -6056,6 +6065,7 @@ EOF
- __asm__(".symver ff_foo,av_foo@VERSION");
- void ff_foo(void) {}
- EOF
-+fi
- 
- if [ -z "$optflags" ]; then
-     if enabled small; then
-@@ -6729,7 +6739,7 @@ Version: $version
+@@ -6805,7 +6814,7 @@ Version: $version
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts:
diff --git a/multimedia/ffmpeg3/patches/patch-libavutil_x86_asm.h b/multimedia/ffmpeg3/patches/patch-libavutil_x86_asm.h
index 1f723d7907e..19e432b97a2 100644
--- a/multimedia/ffmpeg3/patches/patch-libavutil_x86_asm.h
+++ b/multimedia/ffmpeg3/patches/patch-libavutil_x86_asm.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-libavutil_x86_asm.h,v 1.1 2016/03/05 08:52:23 ryoon Exp $
+$NetBSD: patch-libavutil_x86_asm.h,v 1.2 2016/10/28 19:15:06 adam Exp $
 
-avoid SunOS regset.h definition for REG_SP
+Avoid SunOS regset.h definition for REG_SP
 
---- libavutil/x86/asm.h.orig	2016-01-15 16:58:37.000000000 +0000
+--- libavutil/x86/asm.h.orig	2016-10-28 18:31:25.000000000 +0000
 +++ libavutil/x86/asm.h
 @@ -27,6 +27,11 @@
  typedef struct xmm_reg { uint64_t a, b; } xmm_reg;
@@ -14,5 +14,5 @@ avoid SunOS regset.h definition for REG_SP
 +#endif
 +
  #if ARCH_X86_64
- #    define OPSIZE "q"
- #    define REG_a "rax"
+ #    define FF_OPSIZE "q"
+ #    define FF_REG_a "rax"