From owner-svn-ports-all@freebsd.org Sun Nov 5 15:28:00 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88A78E6E094; Sun, 5 Nov 2017 15:28:00 +0000 (UTC) (envelope-from riggs@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 mx1.freebsd.org (Postfix) with ESMTPS id 5714F82EEC; Sun, 5 Nov 2017 15:28:00 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA5FRxOb028643; Sun, 5 Nov 2017 15:27:59 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA5FRxZK028641; Sun, 5 Nov 2017 15:27:59 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201711051527.vA5FRxZK028641@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 5 Nov 2017 15:27:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453549 - in head/multimedia: mencoder mplayer/files X-SVN-Group: ports-head X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in head/multimedia: mencoder mplayer/files X-SVN-Commit-Revision: 453549 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 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: Sun, 05 Nov 2017 15:28:00 -0000 Author: riggs Date: Sun Nov 5 15:27:59 2017 New Revision: 453549 URL: https://svnweb.freebsd.org/changeset/ports/453549 Log: Retain API compatibility with faac 1.29.9 and later Details: - See PR 223416 Added: head/multimedia/mplayer/files/patch-libmpcodecs_ae__faac.c (contents, props changed) Modified: head/multimedia/mencoder/Makefile Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Sun Nov 5 14:56:26 2017 (r453548) +++ head/multimedia/mencoder/Makefile Sun Nov 5 15:27:59 2017 (r453549) @@ -3,7 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org Added: head/multimedia/mplayer/files/patch-libmpcodecs_ae__faac.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/patch-libmpcodecs_ae__faac.c Sun Nov 5 15:27:59 2017 (r453549) @@ -0,0 +1,13 @@ +--- libmpcodecs/ae_faac.c.orig 2011-07-27 15:33:03 UTC ++++ libmpcodecs/ae_faac.c +@@ -183,7 +183,9 @@ int mpae_init_faac(audio_encoder_t *enco + if(MAIN==0) config->aacObjectType--; + config->mpegVersion = (param_mpeg == 4 ? MPEG4 : MPEG2); + config->useTns = param_tns; +- config->allowMidside = 1; ++ //Do not set allowMidside for API compatibility with faac, ++ //see https://github.com/knik0/faac/issues/8 for details ++ //config->allowMidside = 1; + config->shortctl = SHORTCTL_NORMAL; + param_cutoff = param_cutoff ? param_cutoff : encoder->params.sample_rate / 2; + if(param_cutoff > encoder->params.sample_rate / 2)