svn commit: r453549 - in head/multimedia: mencoder mplayer/files

[Thomas Zander]

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 at 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)