Date: Thu, 9 May 2019 00:54:18 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> 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 Message-ID: <201905090054.x490sIxS010009@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 }, };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905090054.x490sIxS010009>