aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorriggs <riggs@FreeBSD.org>2017-11-07 02:31:33 +0800
committerriggs <riggs@FreeBSD.org>2017-11-07 02:31:33 +0800
commitb69e79092de61f8048decba447cde55e969679ea (patch)
treeb1e15c939d99fe6f1b442ef0cc2740915e1c6161
parent09b3df51a7a81f477afef8c368d7b11a166dbec7 (diff)
downloadfreebsd-ports-gnome-b69e79092de61f8048decba447cde55e969679ea.tar.gz
freebsd-ports-gnome-b69e79092de61f8048decba447cde55e969679ea.tar.zst
freebsd-ports-gnome-b69e79092de61f8048decba447cde55e969679ea.zip
Retain API compatibility with faac 1.29.9 and later
Details: - See PR 223416 PR: 223448 Submitted by: riggs Approved by: wg (maintainer)
-rw-r--r--multimedia/ffmpeg0/Makefile2
-rw-r--r--multimedia/ffmpeg0/files/patch-libavcodec_libfaac.c13
2 files changed, 14 insertions, 1 deletions
diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile
index b8e7753352ca..f3e42f6ee536 100644
--- a/multimedia/ffmpeg0/Makefile
+++ b/multimedia/ffmpeg0/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 0.7.17
-PORTREVISION= 8
+PORTREVISION= 9
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
diff --git a/multimedia/ffmpeg0/files/patch-libavcodec_libfaac.c b/multimedia/ffmpeg0/files/patch-libavcodec_libfaac.c
new file mode 100644
index 000000000000..57c706ea5ab2
--- /dev/null
+++ b/multimedia/ffmpeg0/files/patch-libavcodec_libfaac.c
@@ -0,0 +1,13 @@
+--- libavcodec/libfaac.c.orig 2015-03-12 00:05:24 UTC
++++ libavcodec/libfaac.c
+@@ -84,7 +84,9 @@ static av_cold int Faac_encode_init(AVCo
+ }
+ faac_cfg->mpegVersion = MPEG4;
+ faac_cfg->useTns = 0;
+- faac_cfg->allowMidside = 1;
++ //Do not set allowMidside for API compatibility with faac,
++ //see https://github.com/knik0/faac/issues/8 for details
++ //faac_cfg->allowMidside = 1;
+ faac_cfg->bitRate = avctx->bit_rate / avctx->channels;
+ faac_cfg->bandWidth = avctx->cutoff;
+ if(avctx->flags & CODEC_FLAG_QSCALE) {