aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorriggs <riggs@FreeBSD.org>2017-11-05 23:27:59 +0800
committerriggs <riggs@FreeBSD.org>2017-11-05 23:27:59 +0800
commit6b02cd921249ba302d0a9b5a8b88a1d505105ba7 (patch)
treefaa279e7154b05e17feb576e7dd9b12305f04f64
parent0facda6baa4a65a7093575466176a51d1c176b73 (diff)
downloadfreebsd-ports-gnome-6b02cd921249ba302d0a9b5a8b88a1d505105ba7.tar.gz
freebsd-ports-gnome-6b02cd921249ba302d0a9b5a8b88a1d505105ba7.tar.zst
freebsd-ports-gnome-6b02cd921249ba302d0a9b5a8b88a1d505105ba7.zip
Retain API compatibility with faac 1.29.9 and later
Details: - See PR 223416
-rw-r--r--multimedia/mencoder/Makefile2
-rw-r--r--multimedia/mplayer/files/patch-libmpcodecs_ae__faac.c13
2 files changed, 14 insertions, 1 deletions
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 390ab76f391b..4e047bea494f 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -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
diff --git a/multimedia/mplayer/files/patch-libmpcodecs_ae__faac.c b/multimedia/mplayer/files/patch-libmpcodecs_ae__faac.c
new file mode 100644
index 000000000000..59bffc2bd20b
--- /dev/null
+++ b/multimedia/mplayer/files/patch-libmpcodecs_ae__faac.c
@@ -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)