version 2.7:

- FFT video filter
- TDSC decoder
- DTS lossless extension (XLL) decoding (not lossless, disabled by default)
- showwavespic filter
- DTS decoding through libdcadec
- Drop support for nvenc API before 5.0
- nvenc HEVC encoder
- Detelecine filter
- Intel QSV-accelerated H.264 encoding
- MMAL-accelerated H.264 decoding
- basic APNG encoder and muxer with default extension "apng"
- unpack DivX-style packed B-frames in MPEG-4 bitstream filter
- WebM Live Chunk Muxer
- nvenc level and tier options
- chorus filter
- Canopus HQ/HQA decoder
- Automatically rotate videos based on metadata in ffmpeg
- improved Quickdraw compatibility
- VP9 high bit-depth and extended colorspaces decoding support
- WebPAnimEncoder API when available for encoding and muxing WebP
- Direct3D11-accelerated decoding
- Support Secure Transport
- Multipart JPEG demuxer

5 files changed, 26 insertions, 33 deletions

diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common
index b2246d577e2..5cb0cb1d0e8 100644
--- a/multimedia/ffmpeg2/Makefile.common
+++ b/multimedia/ffmpeg2/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.33 2015/05/18 11:57:07 adam Exp $
+# $NetBSD: Makefile.common,v 1.34 2015/06/11 17:02:35 adam Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
-DISTNAME=	ffmpeg-2.6.3
+DISTNAME=	ffmpeg-2.7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/ffmpeg2/PLIST b/multimedia/ffmpeg2/PLIST
index dd997fb5ca4..1f9bba2993e 100644
--- a/multimedia/ffmpeg2/PLIST
+++ b/multimedia/ffmpeg2/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.8 2015/03/08 08:10:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/06/11 17:02:35 adam Exp $
 bin/ffmpeg2
 bin/ffprobe2
 bin/ffserver2
 include/ffmpeg2/libavcodec/avcodec.h
 include/ffmpeg2/libavcodec/avfft.h
+include/ffmpeg2/libavcodec/d3d11va.h
 include/ffmpeg2/libavcodec/dv_profile.h
 include/ffmpeg2/libavcodec/dxva2.h
 include/ffmpeg2/libavcodec/old_codec_ids.h
@@ -100,7 +101,7 @@ include/ffmpeg2/libswscale/version.h
 lib/ffmpeg2/libavcodec.a
 lib/ffmpeg2/libavcodec.so
 lib/ffmpeg2/libavcodec.so.56
-lib/ffmpeg2/libavcodec.so.56.26.100
+lib/ffmpeg2/libavcodec.so.56.41.100
 lib/ffmpeg2/libavdevice.a
 lib/ffmpeg2/libavdevice.so
 lib/ffmpeg2/libavdevice.so.56
@@ -108,15 +109,15 @@ lib/ffmpeg2/libavdevice.so.56.4.100
 lib/ffmpeg2/libavfilter.a
 lib/ffmpeg2/libavfilter.so
 lib/ffmpeg2/libavfilter.so.5
-lib/ffmpeg2/libavfilter.so.5.11.102
+lib/ffmpeg2/libavfilter.so.5.16.101
 lib/ffmpeg2/libavformat.a
 lib/ffmpeg2/libavformat.so
 lib/ffmpeg2/libavformat.so.56
-lib/ffmpeg2/libavformat.so.56.25.101
+lib/ffmpeg2/libavformat.so.56.36.100
 lib/ffmpeg2/libavutil.a
 lib/ffmpeg2/libavutil.so
 lib/ffmpeg2/libavutil.so.54
-lib/ffmpeg2/libavutil.so.54.20.100
+lib/ffmpeg2/libavutil.so.54.27.100
 lib/ffmpeg2/libpostproc.a
 lib/ffmpeg2/libpostproc.so
 lib/ffmpeg2/libpostproc.so.53
@@ -124,7 +125,7 @@ lib/ffmpeg2/libpostproc.so.53.3.100
 lib/ffmpeg2/libswresample.a
 lib/ffmpeg2/libswresample.so
 lib/ffmpeg2/libswresample.so.1
-lib/ffmpeg2/libswresample.so.1.1.100
+lib/ffmpeg2/libswresample.so.1.2.100
 lib/ffmpeg2/libswscale.a
 lib/ffmpeg2/libswscale.so
 lib/ffmpeg2/libswscale.so.3
@@ -154,6 +155,7 @@ share/doc/ffmpeg2/writing_filters.txt
 share/examples/ffmpeg2/ffserver.conf
 share/ffmpeg2/examples/Makefile
 share/ffmpeg2/examples/README
+share/ffmpeg2/examples/avio_list_dir.c
 share/ffmpeg2/examples/avio_reading.c
 share/ffmpeg2/examples/decoding_encoding.c
 share/ffmpeg2/examples/demuxing_decoding.c
diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo
index ff2d135033c..804784beb62 100644
--- a/multimedia/ffmpeg2/distinfo
+++ b/multimedia/ffmpeg2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.32 2015/05/18 11:57:07 adam Exp $
+$NetBSD: distinfo,v 1.33 2015/06/11 17:02:35 adam Exp $
 
-SHA1 (ffmpeg-2.6.3.tar.bz2) = a3307d20f97e8b75a113712e0258ab11d548d280
-RMD160 (ffmpeg-2.6.3.tar.bz2) = 1bf56d9362f2060892124ec709258b85930921b8
-Size (ffmpeg-2.6.3.tar.bz2) = 7803314 bytes
+SHA1 (ffmpeg-2.7.tar.bz2) = 70bd3bef074b269ff0b1f78d12e05b5a04025585
+RMD160 (ffmpeg-2.7.tar.bz2) = c56462f4ff60d0de00f80b2a247076cc6a7681e7
+Size (ffmpeg-2.7.tar.bz2) = 8149595 bytes
 SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
-SHA1 (patch-configure) = 580e744f44bc6b7622a21d27fcf14f934a280179
-SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 8634661d76bc3bce43437caa4244b4f52237709f
+SHA1 (patch-configure) = 17d22d134a2cdab83f03ea1fe94e24ea55eaf349
+SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = f997271f4f4604987591d7f17c571aaaa8a6188a
 SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
 SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea
 SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40
diff --git a/multimedia/ffmpeg2/patches/patch-configure b/multimedia/ffmpeg2/patches/patch-configure
index aaa968ef049..4447c3b100a 100644
--- a/multimedia/ffmpeg2/patches/patch-configure
+++ b/multimedia/ffmpeg2/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.6 2015/02/14 15:41:42 adam Exp $
+$NetBSD: patch-configure,v 1.7 2015/06/11 17:02:35 adam Exp $
 
---- configure.orig	2015-02-13 15:56:33.000000000 +0000
+--- configure.orig	2015-06-09 23:27:49.000000000 +0000
 +++ configure
-@@ -4011,6 +4011,11 @@ case $target_os in
+@@ -4197,6 +4197,11 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -14,7 +14,7 @@ $NetBSD: patch-configure,v 1.6 2015/02/14 15:41:42 adam Exp $
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -4407,10 +4412,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -4602,10 +4607,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF
  
@@ -29,9 +29,9 @@ $NetBSD: patch-configure,v 1.6 2015/02/14 15:41:42 adam Exp $
  EOF
 -od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
  
- if  [ "$cpu" = "power7" ] || [ "$cpu" = "power8" ] || enabled ppc64; then
-     if ! enabled bigendian && enabled altivec ;then
-@@ -5163,6 +5171,7 @@ enabled xmm_clobber_test &&
+ 
+ check_gas() {
+@@ -5423,6 +5431,7 @@ enabled xmm_clobber_test &&
                    -Wl,--wrap,sws_scale ||
      disable xmm_clobber_test
  
@@ -39,7 +39,7 @@ $NetBSD: patch-configure,v 1.6 2015/02/14 15:41:42 adam Exp $
  echo "X{};" > $TMPV
  if test_ldflags -Wl,--version-script,$TMPV; then
      append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -5175,6 +5184,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+@@ -5435,6 +5444,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
  void ff_foo(void) {}
  EOF
  fi
@@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.6 2015/02/14 15:41:42 adam Exp $
  
  if [ -z "$optflags" ]; then
      if enabled small; then
-@@ -5767,7 +5777,7 @@ Version: $version
+@@ -6038,7 +6048,7 @@ Version: $version
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts:
diff --git a/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp_init.c b/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp_init.c
index 150aac42daa..e0b561f5647 100644
--- a/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp_init.c
+++ b/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp_init.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-libavcodec_x86_ac3dsp_init.c,v 1.1 2014/12/03 15:06:11 bouyer Exp $
+$NetBSD: patch-libavcodec_x86_ac3dsp_init.c,v 1.2 2015/06/11 17:02:35 adam Exp $
 
 Fix from PR pkg/48680
 
@@ -65,15 +65,6 @@ Fix from PR pkg/48680
          "add             $16, %0            \n"                 \
          "jl               1b                \n"                 \
          : "+&r"(i), "=&r"(j), "=&r"(k), "=&r"(m)                \
-@@ -166,7 +168,7 @@
-                matrix_cmp[3][0] == matrix_cmp[4][0]) {
-         MIX5(IF1, IF0);
-     } else {
--        DECLARE_ALIGNED(16, float, matrix_simd)[AC3_MAX_CHANNELS][2][4];
-+        float matrix_simd[AC3_MAX_CHANNELS][2][4];
-         float *samp[AC3_MAX_CHANNELS];
-
-         for (j = 0; j < in_ch; j++)
 @@ -180,8 +182,8 @@
              "movss    4(%2, %0), %%xmm5         \n"
              "shufps          $0, %%xmm4, %%xmm4 \n"