From owner-svn-ports-head@freebsd.org Fri Apr 27 15:38:49 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 42A7DFAAEC5; Fri, 27 Apr 2018 15:38:49 +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 D8D3D735F6; Fri, 27 Apr 2018 15:38:48 +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 CFA835A5; Fri, 27 Apr 2018 15:38:48 +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 w3RFcmGb066767; Fri, 27 Apr 2018 15:38:48 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3RFcmfg066766; Fri, 27 Apr 2018 15:38:48 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804271538.w3RFcmfg066766@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 27 Apr 2018 15:38:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468439 - head/graphics/amide/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/graphics/amide/files X-SVN-Commit-Revision: 468439 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: Fri, 27 Apr 2018 15:38:49 -0000 Author: jbeich Date: Fri Apr 27 15:38:48 2018 New Revision: 468439 URL: https://svnweb.freebsd.org/changeset/ports/468439 Log: graphics/amide: unbreak with ffmpeg 4.0 mpeg_encode.c:301:20: error: no member named 'me_method' in 'struct AVCodecContext' encode->context->me_method=5; /* 5 is epzs */ ~~~~~~~~~~~~~~~ ^ PR: 227726 Modified: head/graphics/amide/files/patch-src_mpeg__encode.c (contents, props changed) Modified: head/graphics/amide/files/patch-src_mpeg__encode.c ============================================================================== --- head/graphics/amide/files/patch-src_mpeg__encode.c Fri Apr 27 15:28:12 2018 (r468438) +++ head/graphics/amide/files/patch-src_mpeg__encode.c Fri Apr 27 15:38:48 2018 (r468439) @@ -31,7 +31,7 @@ if (!encode->picture) { g_warning("couldn't allocate memory for encode->picture"); encode_free(encode); -@@ -293,7 +294,7 @@ gpointer mpeg_encode_setup(gchar * outpu +@@ -293,11 +294,13 @@ gpointer mpeg_encode_setup(gchar * output_filename, mp encode->context->time_base= (AVRational){1,FRAMES_PER_SECOND}; encode->context->gop_size = 10; /* emit one intra frame every ten frames */ encode->context->max_b_frames=10; @@ -40,6 +40,12 @@ /* encoding parameters */ encode->context->sample_aspect_ratio= (AVRational){1,1}; /* our pixels are square */ ++#if LIBAVCODEC_VERSION_MAJOR < 58 + encode->context->me_method=5; /* 5 is epzs */ ++#endif + encode->context->trellis=2; /* turn trellis quantization on */ + + /* open it */ @@ -355,6 +356,10 @@ gpointer mpeg_encode_setup(gchar * outpu encode->picture->linesize[1] = encode->context->width/2; encode->picture->linesize[2] = encode->context->width/2;