From owner-svn-ports-head@freebsd.org Wed May 2 13:31:46 2018 Return-Path: Delivered-To: svn-ports-head@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 C6500FA9B13; Wed, 2 May 2018 13:31:46 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6F27E79FE7; Wed, 2 May 2018 13:31:46 +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 6A19A119FB; Wed, 2 May 2018 13:31:46 +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 w42DVkI0049856; Wed, 2 May 2018 13:31:46 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w42DVksW049855; Wed, 2 May 2018 13:31:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805021331.w42DVksW049855@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 2 May 2018 13:31:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468835 - head/cad/netgen/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/cad/netgen/files X-SVN-Commit-Revision: 468835 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 May 2018 13:31:46 -0000 Author: jbeich Date: Wed May 2 13:31:46 2018 New Revision: 468835 URL: https://svnweb.freebsd.org/changeset/ports/468835 Log: multimedia/webcamoid: unbreak with ffmpeg 4.0 ngpkg.cpp:2342:27: error: use of undeclared identifier 'CODEC_FLAG_PSNR' context->flags |= CODEC_FLAG_PSNR; ^ PR: 227726 Reported by: antoine (via exp-run) Modified: head/cad/netgen/files/patch-ng_ngpkg.cpp (contents, props changed) Modified: head/cad/netgen/files/patch-ng_ngpkg.cpp ============================================================================== --- head/cad/netgen/files/patch-ng_ngpkg.cpp Wed May 2 13:26:36 2018 (r468834) +++ head/cad/netgen/files/patch-ng_ngpkg.cpp Wed May 2 13:31:46 2018 (r468835) @@ -9,15 +9,17 @@ static FILE *MPGfile; static buffer_t buff; static struct SwsContext *img_convert_ctx; -@@ -2338,7 +2338,7 @@ namespace netgen +@@ -2338,8 +2338,8 @@ namespace netgen context->time_base = s; context->gop_size = gopsize; context->max_b_frames = bframes; - context->pix_fmt = PIX_FMT_YUV420P; +- context->flags |= CODEC_FLAG_PSNR; + context->pix_fmt = AV_PIX_FMT_YUV420P; - context->flags |= CODEC_FLAG_PSNR; ++ context->flags |= AV_CODEC_FLAG_PSNR; // if( avcodec_open( context, codec ) < 0 ) { + if( avcodec_open2( context, codec, NULL) < 0 ) { @@ -2351,7 +2351,7 @@ namespace netgen return TCL_ERROR; }