From owner-svn-ports-head@freebsd.org Mon Nov 6 09:28:58 2017 Return-Path: Delivered-To: svn-ports-head@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 77674E57D8C; Mon, 6 Nov 2017 09:28:58 +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 44B2C66E05; Mon, 6 Nov 2017 09:28:58 +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 vA69Svc8085465; Mon, 6 Nov 2017 09:28:57 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA69Svge085463; Mon, 6 Nov 2017 09:28:57 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201711060928.vA69Svge085463@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 6 Nov 2017 09:28:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453605 - in head/multimedia/mpeg4ip: . files X-SVN-Group: ports-head X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in head/multimedia/mpeg4ip: . files X-SVN-Commit-Revision: 453605 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.23 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: Mon, 06 Nov 2017 09:28:58 -0000 Author: riggs Date: Mon Nov 6 09:28:57 2017 New Revision: 453605 URL: https://svnweb.freebsd.org/changeset/ports/453605 Log: Retain API compatibility with faac 1.29.9 and later Details: - See PR 223416 Added: head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__faac.cpp (contents, props changed) Modified: head/multimedia/mpeg4ip/Makefile Modified: head/multimedia/mpeg4ip/Makefile ============================================================================== --- head/multimedia/mpeg4ip/Makefile Mon Nov 6 09:18:13 2017 (r453604) +++ head/multimedia/mpeg4ip/Makefile Mon Nov 6 09:28:57 2017 (r453605) @@ -3,7 +3,7 @@ PORTNAME= mpeg4ip PORTVERSION= 1.6.1 -PORTREVISION= 36 +PORTREVISION= 37 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= LOCAL/ahze # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136 Added: head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__faac.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__faac.cpp Mon Nov 6 09:28:57 2017 (r453605) @@ -0,0 +1,22 @@ +--- server/mp4live/audio_faac.cpp.orig 2007-01-22 17:31:28 UTC ++++ server/mp4live/audio_faac.cpp +@@ -296,7 +296,7 @@ bool CFaacAudioEncoder::Init(void) + + debug_message("version = %d", m_faacConfig->version); + debug_message("name = %s", m_faacConfig->name); +- debug_message("allowMidside = %d", m_faacConfig->allowMidside); ++ //debug_message("allowMidside = %d", m_faacConfig->allowMidside); + debug_message("useLfe = %d", m_faacConfig->useLfe); + debug_message("useTns = %d", m_faacConfig->useTns); + debug_message("bitRate = %lu", m_faacConfig->bitRate); +@@ -308,7 +308,9 @@ bool CFaacAudioEncoder::Init(void) + + m_faacConfig->mpegVersion = MPEG4; + m_faacConfig->aacObjectType = LOW; +- m_faacConfig->allowMidside = false; ++ //Do not set allowMidside for API compatibility with faac, ++ //see https://github.com/knik0/faac/issues/8 for details ++ //m_faacConfig->allowMidside = false; + m_faacConfig->useLfe = false; + m_faacConfig->useTns = false; + m_faacConfig->inputFormat = FAAC_INPUT_16BIT;