Update to x265 3.1

Add patch to "Fix crash with aq-motion when aq-mode is disabled".

From Brad
This commit is contained in:
kn 2019-07-05 14:55:38 +00:00
parent 223c48b769
commit 871cb4832d
3 changed files with 22 additions and 7 deletions

View File

@ -1,22 +1,21 @@
# $OpenBSD: Makefile,v 1.40 2019/02/08 22:46:55 kn Exp $
# $OpenBSD: Makefile,v 1.41 2019/07/05 14:55:38 kn Exp $
COMMENT= free H.265/HEVC encoder
VER= 3.0
VER= 3.1
DISTNAME= x265_${VER}
PKGNAME= x265-${VER}
CATEGORIES= multimedia
MASTER_SITES= https://bitbucket.org/multicoreware/x265/downloads/
SHARED_LIBS= x265 17.0
SHARED_LIBS= x265 18.0
HOMEPAGE= http://x265.org/
MAINTAINER= Brad Smith <brad@comstyle.com>
# GPLv2+
PERMIT_PACKAGE_CDROM= patents
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE= Yes
WANTLIB= c m pthread ${COMPILER_LIBCXX}

View File

@ -1,2 +1,2 @@
SHA256 (x265_3.0.tar.gz) = xbn8JgyrvEqBVhpEj0zpytchgnK0AR/qvDprdRsvBmI=
SIZE (x265_3.0.tar.gz) = 1398519
SHA256 (x265_3.1.tar.gz) = OYB+bsb8HjhYKaiC9b3uHtErNYstVpGNbdzvrAVP1gU=
SIZE (x265_3.1.tar.gz) = 1419649

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-source_common_lowres_cpp,v 1.1 2019/07/05 14:55:38 kn Exp $
Fix crash with aq-motion when aq-mode is disabled
Index: source/common/lowres.cpp
--- source/common/lowres.cpp.orig
+++ source/common/lowres.cpp
@@ -71,7 +71,7 @@ bool Lowres::create(x265_param* param, PicYuv *origPic
size_t planesize = lumaStride * (lines + 2 * origPic->m_lumaMarginY);
size_t padoffset = lumaStride * origPic->m_lumaMarginY + origPic->m_lumaMarginX;
- if (!!param->rc.aqMode || !!param->rc.hevcAq)
+ if (!!param->rc.aqMode || !!param->rc.hevcAq || !!param->bAQMotion)
{
CHECKED_MALLOC_ZERO(qpAqOffset, double, cuCountFullRes);
CHECKED_MALLOC_ZERO(invQscaleFactor, int, cuCountFullRes);