cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio/aqualung: Fix build with FFmpeg 3.0.x

Browse Source 
Add patch-ffmpeg3, obtained from upstream [1], to allow aqualung to
build successfully once multimedia/ffmpeg is updated to 3.0.x.
Note that multimedia/ffmpeg is currently still on the 2.8.x branch,
however this patch is backwards compatible with ffmpeg 2.8.x.

[1] 3f60efe3db

Approved by:	Chris Hutchinson <portmaster@BSDforge.com> (maintainer), mat (mentor)
Differential Revision:	https://reviews.freebsd.org/D6820
This commit is contained in:
Ben Woods 2016-06-15 21:35:22 +00:00
parent 238dc6b76a
commit a346fc26be
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=416939
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/aqualung/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= aqualung
PORTVERSION= 1.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF

24
audio/aqualung/files/patch-ffmpeg3 Normal file
View File

@ -0,0 +1,24 @@
From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
From: Jamie Heilman <jamie@audible.transient.net>
Date: Sun, 8 May 2016 19:34:36 +0000
Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later
With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer()
were deprecated; the new default AVCodecContext.get_buffer2()
implementation works fine for us.
--- src/decoder/dec_lavc.c.orig
+++ src/decoder/dec_lavc.c
@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char * filename) {
return DECODER_OPEN_BADLIB;
pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
+#if LIBAVCODEC_VERSION_MAJOR < 55
#if LIBAVCODEC_VERSION_MAJOR >= 53
pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
#endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base;