Update to 20160123

Changelog:
encoder_open: Fix memory leak
arm: do not fill mc_weight*_neon tabs for HIGH_BIT_DEPTH
arm: Eliminate text relocations in asm
arm: Don't assume alignment in mbtree_propagate_list_internal where it isn't provided
Fix checkasm register clobber check on iOS

4 files changed, 30 insertions, 30 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index ad87ea5a222..11d176aad11 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2015/12/28 11:37:03 adam Exp $
+# $NetBSD: Makefile,v 1.56 2016/01/24 14:34:11 ryoon Exp $
 
-SNAPSHOT_DATE=	20151227
+SNAPSHOT_DATE=	20160123
 
 DISTNAME=	x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=	x264-devel-${SNAPSHOT_DATE}
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 3f3e0bbfb51..7122b7c583b 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.39 2015/12/28 11:37:03 adam Exp $
+$NetBSD: distinfo,v 1.40 2016/01/24 14:34:11 ryoon Exp $
 
-SHA1 (x264-snapshot-20151227-2245.tar.bz2) = 51f86923adcc3d929037e786a64df4fa0b0f8c95
-RMD160 (x264-snapshot-20151227-2245.tar.bz2) = 30c4b8da5bf38fe3263d0c4656ce2db32ccd5bd3
-SHA512 (x264-snapshot-20151227-2245.tar.bz2) = bbfbcddcfc83bed0565d1724e855671211f809a03424529ca5560e618dfd7ccd0123cf4321d03b07b183cb3df4304c337fab1673747cdf3726cdb3246b3d95fa
-Size (x264-snapshot-20151227-2245.tar.bz2) = 725710 bytes
-SHA1 (patch-aa) = 0ae14acfebf0bd19f1d1811b3cc201c8cb3a3dc4
+SHA1 (x264-snapshot-20160123-2245.tar.bz2) = 71c04a20fcdd794517baac83b9348642675b2072
+RMD160 (x264-snapshot-20160123-2245.tar.bz2) = 2637a22640b356f5b006173d1c07d2ca3e42c2a2
+SHA512 (x264-snapshot-20160123-2245.tar.bz2) = cd71a3169a349e7b9e5da0430773b1494f7f28fb2a8a062f31ce97203a8f41833ce9ac1981a3195fb5b261c1e2ac0ea2a4b431fc01bbfe0676e3e488f93eb650
+Size (x264-snapshot-20160123-2245.tar.bz2) = 727147 bytes
+SHA1 (patch-aa) = c947b8d057d653169cf62c7983e0f36780d466b4
 SHA1 (patch-ab) = ddc71a4ee27693d5e80527efb26326c4ed9546bd
-SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6
+SHA1 (patch-ba) = b16486f28ba5c34449e015906957062186e657af
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index 0a513ead7ed..cd06f9e53ef 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.21 2015/12/28 11:37:03 adam Exp $
+$NetBSD: patch-aa,v 1.22 2016/01/24 14:34:11 ryoon Exp $
 
 Add support for DragonFly.
 Use 'amd64' as a synonym for 'x86_64'.
 Avoid endian test failure for -flto.
 Do not force compiler optimisations.
 
---- configure.orig	2015-10-24 20:45:04.000000000 +0000
+--- configure.orig	2016-01-23 21:45:04.000000000 +0000
 +++ configure
 @@ -578,6 +578,10 @@ case $host_os in
          SYS="FREEBSD"
@@ -18,7 +18,7 @@ Do not force compiler optimisations.
      kfreebsd*-gnu)
          SYS="FREEBSD"
          define HAVE_MALLOC_H
-@@ -689,7 +693,7 @@ case $host_cpu in
+@@ -678,7 +682,7 @@ case $host_cpu in
              ASFLAGS="$ASFLAGS -f elf32"
          fi
          ;;
@@ -27,7 +27,7 @@ Do not force compiler optimisations.
          ARCH="X86_64"
          AS="${AS-yasm}"
          AS_EXT=".asm"
-@@ -713,14 +717,15 @@ case $host_cpu in
+@@ -702,14 +706,15 @@ case $host_cpu in
          fi
          ;;
      powerpc*)
@@ -44,7 +44,7 @@ Do not force compiler optimisations.
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
-@@ -902,7 +907,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
+@@ -891,7 +896,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
  CPU_ENDIAN="little-endian"
  if [ $compiler = GNU ]; then
      echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c
@@ -53,16 +53,16 @@ Do not force compiler optimisations.
      if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix}strings -a conftest.o | grep -q FPendian) ; then
          define WORDS_BIGENDIAN
          CPU_ENDIAN="big-endian"
-@@ -927,7 +932,7 @@ fi
- # pthread-win32 is lgpl, prevent its use if --disable-gpl is specified and targeting windows
- [ "$SYS" = "WINDOWS" -a "$gpl" = "no" -a "$thread" = "auto" ] && thread="win32"
+@@ -913,7 +918,7 @@ fi
+ 
+ # autodetect options that weren't forced nor disabled
  
 -libpthread=""
 +libpthread="$PTHREAD_LDFLAGS $PTHREAD_LIBS"
- if [ "$thread" = "auto" ]; then
-     thread="no"
-     case $SYS in
-@@ -1141,10 +1146,10 @@ fi
+ if [ "$SYS" = "WINDOWS" -a "$thread" = "posix" ] ; then
+     if [ "$gpl" = "no" ] ; then
+         echo "Warning: pthread-win32 is LGPL and is therefore not supported with --disable-gpl"
+@@ -1124,10 +1129,10 @@ fi
  cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT
  
  if [ "$pic" = "yes" ] ; then
@@ -75,7 +75,7 @@ Do not force compiler optimisations.
      [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
  fi
  
-@@ -1158,8 +1163,6 @@ fi
+@@ -1141,8 +1146,6 @@ fi
  
  if [ "$debug" = "yes" ]; then
      CFLAGS="-O1 -g $CFLAGS"
@@ -84,7 +84,7 @@ Do not force compiler optimisations.
  fi
  
  if cc_check '' -fno-tree-vectorize ; then
-@@ -1288,7 +1291,7 @@ else # gcc/icc
+@@ -1271,7 +1274,7 @@ else # gcc/icc
      DEPMM="$DEPMM -g0"
      AR="$AR rc "
      LD="$CC -o "
diff --git a/multimedia/x264-devel/patches/patch-ba b/multimedia/x264-devel/patches/patch-ba
index 69cb4f2ca4e..ec87d5d2654 100644
--- a/multimedia/x264-devel/patches/patch-ba
+++ b/multimedia/x264-devel/patches/patch-ba
@@ -1,13 +1,13 @@
-$NetBSD: patch-ba,v 1.4 2012/11/08 19:55:56 adam Exp $
+$NetBSD: patch-ba,v 1.5 2016/01/24 14:34:11 ryoon Exp $
 
---- encoder/analyse.c.orig	2011-07-07 20:45:05.000000000 +0000
+--- encoder/analyse.c.orig	2016-01-23 21:45:04.000000000 +0000
 +++ encoder/analyse.c
-@@ -285,7 +285,7 @@ float *x264_analyse_prepare_costs( x264_
-         return NULL;
+@@ -322,7 +322,7 @@ int x264_analyse_init_costs( x264_t *h )
+ 
      logs[0] = 0.718f;
      for( int i = 1; i <= 2*4*2048; i++ )
--        logs[i] = log2f(i+1)*2 + 1.718f;
+-        logs[i] = log2f( i+1 ) * 2.0f + 1.718f;
 +        logs[i] = logf(i+1)*2.88539f + 1.718f;
-     return logs;
- }
  
+     for( int qp = X264_MIN( h->param.rc.i_qp_min, QP_MAX_SPEC ); qp <= h->param.rc.i_qp_max; qp++ )
+         if( init_costs( h, logs, qp ) )