svn commit: r453638 - in head/multimedia/ffmpeg0: . files

[Thomas Zander]

Author: riggs
Date: Mon Nov  6 18:31:33 2017
New Revision: 453638
URL: https://svnweb.freebsd.org/changeset/ports/453638

Log:
  Retain API compatibility with faac 1.29.9 and later
  
  Details:
  - See PR 223416
  
  PR:		223448
  Submitted by:	riggs
  Approved by:	wg (maintainer)

Added:
  head/multimedia/ffmpeg0/files/patch-libavcodec_libfaac.c   (contents, props changed)
Modified:
  head/multimedia/ffmpeg0/Makefile

Modified: head/multimedia/ffmpeg0/Makefile
==============================================================================
--- head/multimedia/ffmpeg0/Makefile	Mon Nov  6 17:59:15 2017	(r453637)
+++ head/multimedia/ffmpeg0/Makefile	Mon Nov  6 18:31:33 2017	(r453638)
@@ -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/

Added: head/multimedia/ffmpeg0/files/patch-libavcodec_libfaac.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/ffmpeg0/files/patch-libavcodec_libfaac.c	Mon Nov  6 18:31:33 2017	(r453638)
@@ -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) {