version 2.7.1:

- postproc: fix unaligned access
- avformat: clarify what package needs to be compiled with SSL support
- avcodec/libx264: Avoid reconfig on equivalent aspect ratios
- avcodec/flacenc: Fix Invalid Rice order
- tls_gnutls: fix hang on disconnection
- avcodec/hevc_ps: Only discard overread VPS if a previous is available
- ffmpeg: Free last_frame instead of just unref
- avcodec/ffv1enc: fix bps for >8bit yuv when not explicitly set
- avio: fix potential crashes when combining ffio_ensure_seekback + crc
- examples/demuxing_decoding: use properties from frame instead of video_dec_ctx
- h264: er: Copy from the previous reference only if compatible
- doc: fix spelling errors
- configure: only disable VSX for !ppc64el
- ffmpeg_opt: Check for localtime() failure
- avformat/singlejpeg: fix standalone compilation
- configure: Disable VSX on unspecified / generic CPUs
- avformat: Fix bug in parse_rps for HEVC.
- takdec: ensure chan2 is a valid channel index
- avcodec/h264_slice: Use AVFrame dimensions for grayscale handling

3 files changed, 14 insertions, 14 deletions

diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common
index 5cb0cb1d0e8..ef51f8551b5 100644
--- a/multimedia/ffmpeg2/Makefile.common
+++ b/multimedia/ffmpeg2/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.34 2015/06/11 17:02:35 adam Exp $
+# $NetBSD: Makefile.common,v 1.35 2015/06/29 13:12:27 adam Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
-DISTNAME=	ffmpeg-2.7
+DISTNAME=	ffmpeg-2.7.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo
index 804784beb62..d371f69cc3e 100644
--- a/multimedia/ffmpeg2/distinfo
+++ b/multimedia/ffmpeg2/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.33 2015/06/11 17:02:35 adam Exp $
+$NetBSD: distinfo,v 1.34 2015/06/29 13:12:27 adam Exp $
 
-SHA1 (ffmpeg-2.7.tar.bz2) = 70bd3bef074b269ff0b1f78d12e05b5a04025585
-RMD160 (ffmpeg-2.7.tar.bz2) = c56462f4ff60d0de00f80b2a247076cc6a7681e7
-Size (ffmpeg-2.7.tar.bz2) = 8149595 bytes
+SHA1 (ffmpeg-2.7.1.tar.bz2) = ae84d7f51ff25be5160387282a1ca7be6cdbf6bf
+RMD160 (ffmpeg-2.7.1.tar.bz2) = ee27091f9be74786a53344f3d3c6988ed03ec460
+Size (ffmpeg-2.7.1.tar.bz2) = 8152634 bytes
 SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
-SHA1 (patch-configure) = 17d22d134a2cdab83f03ea1fe94e24ea55eaf349
+SHA1 (patch-configure) = bc0dcdb5605b5a112de556ecb466265ef8ff5ca9
 SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = f997271f4f4604987591d7f17c571aaaa8a6188a
 SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
 SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea
diff --git a/multimedia/ffmpeg2/patches/patch-configure b/multimedia/ffmpeg2/patches/patch-configure
index 4447c3b100a..a558c6bf514 100644
--- a/multimedia/ffmpeg2/patches/patch-configure
+++ b/multimedia/ffmpeg2/patches/patch-configure
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.7 2015/06/11 17:02:35 adam Exp $
+$NetBSD: patch-configure,v 1.8 2015/06/29 13:12:27 adam Exp $
 
---- configure.orig	2015-06-09 23:27:49.000000000 +0000
+--- configure.orig	2015-06-19 20:47:55.000000000 +0000
 +++ configure
 @@ -4197,6 +4197,11 @@ case $target_os in
          ;;
@@ -29,9 +29,9 @@ $NetBSD: patch-configure,v 1.7 2015/06/11 17:02:35 adam Exp $
  EOF
 -od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
  
- 
- check_gas() {
-@@ -5423,6 +5431,7 @@ enabled xmm_clobber_test &&
+ if ! enabled ppc64 || enabled bigendian; then
+     disable vsx
+@@ -5426,6 +5434,7 @@ enabled xmm_clobber_test &&
                    -Wl,--wrap,sws_scale ||
      disable xmm_clobber_test
  
@@ -39,7 +39,7 @@ $NetBSD: patch-configure,v 1.7 2015/06/11 17:02:35 adam Exp $
  echo "X{};" > $TMPV
  if test_ldflags -Wl,--version-script,$TMPV; then
      append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -5435,6 +5444,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+@@ -5438,6 +5447,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
  void ff_foo(void) {}
  EOF
  fi
@@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.7 2015/06/11 17:02:35 adam Exp $
  
  if [ -z "$optflags" ]; then
      if enabled small; then
-@@ -6038,7 +6048,7 @@ Version: $version
+@@ -6041,7 +6051,7 @@ Version: $version
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts: