From owner-svn-ports-all@freebsd.org Thu May 9 00:54:19 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4FC4215982D3; Thu, 9 May 2019 00:54:19 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EBC2F6F4C5; Thu, 9 May 2019 00:54:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B8528DC5A; Thu, 9 May 2019 00:54:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x490sIk3010011; Thu, 9 May 2019 00:54:18 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x490sIxS010009; Thu, 9 May 2019 00:54:18 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201905090054.x490sIxS010009@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 9 May 2019 00:54:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r501067 - in branches/2019Q2/multimedia/ffmpeg: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2019Q2/multimedia/ffmpeg: . files X-SVN-Commit-Revision: 501067 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EBC2F6F4C5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 May 2019 00:54:19 -0000 Author: jbeich Date: Thu May 9 00:54:18 2019 New Revision: 501067 URL: https://svnweb.freebsd.org/changeset/ports/501067 Log: MFH: r501064 multimedia/ffmpeg: backport AOM warning fix [libaom-av1 encoder @ 0x807b0d1c0] Value -1.000000 for parameter 'enable-intrabc' out of range [0 - 1] Approved by: ports-secteam blanket Modified: branches/2019Q2/multimedia/ffmpeg/Makefile branches/2019Q2/multimedia/ffmpeg/files/patch-aom Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/multimedia/ffmpeg/Makefile ============================================================================== --- branches/2019Q2/multimedia/ffmpeg/Makefile Thu May 9 00:53:14 2019 (r501066) +++ branches/2019Q2/multimedia/ffmpeg/Makefile Thu May 9 00:54:18 2019 (r501067) @@ -3,6 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 4.1.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= https://ffmpeg.org/releases/ Modified: branches/2019Q2/multimedia/ffmpeg/files/patch-aom ============================================================================== --- branches/2019Q2/multimedia/ffmpeg/files/patch-aom Thu May 9 00:53:14 2019 (r501066) +++ branches/2019Q2/multimedia/ffmpeg/files/patch-aom Thu May 9 00:54:18 2019 (r501067) @@ -5,6 +5,8 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/2d https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e3991a5a45 https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/995889abbf https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/0856c5da07 +https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/0e1ea034d8 +https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/1e8475b507 --- doc/encoders.texi.orig 2018-11-05 23:22:25 UTC +++ doc/encoders.texi @@ -297,6 +299,15 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/08 // provide dummy value to initialize wrapper, values will be updated each _encode() aom_img_wrap(&ctx->rawimg, img_fmt, avctx->width, avctx->height, 1, (unsigned char*)1); +@@ -727,7 +808,7 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, + AVPacket *pkt) + { + AOMContext *ctx = avctx->priv_data; +- int pict_type; ++ int av_unused pict_type; + int ret = ff_alloc_packet2(avctx, pkt, cx_frame->sz, 0); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, @@ -975,19 +1056,37 @@ static const AVOption options[] = { "frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, VE}, { "lag-in-frames", "Number of frames to look ahead at for " @@ -328,7 +339,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/08 + { "row-mt", "Enable row based multi-threading", OFFSET(row_mt), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, + { "enable-cdef", "Enable CDEF filtering", OFFSET(enable_cdef), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, + { "enable-global-motion", "Enable global motion", OFFSET(enable_global_motion), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, -+ { "enable-intrabc", "Enable intra block copy prediction mode", OFFSET(enable_intrabc), AV_OPT_TYPE_BOOL, {.i64 = -1}, 0, 1, VE}, ++ { "enable-intrabc", "Enable intra block copy prediction mode", OFFSET(enable_intrabc), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, + { NULL }, };