aubio: fix build with ffmpeg 4.0

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-06-04 22:27:16 +02:00
parent ec79af4712
commit d8730f3c70
2 changed files with 35 additions and 0 deletions

View File

@@ -16,6 +16,7 @@ DEPENDS += " \
SRC_URI = " \
https://aubio.org/pub/${BPN}-${PV}.tar.bz2 \
file://0001-do-not-build-tests.patch \
file://0002-Fix-build-with-FFmpeg-4.0.patch \
"
SRC_URI[md5sum] = "78d326e5e44d19b0d21a5abf834bae20"
SRC_URI[sha256sum] = "bdc73be1f007218d3ea6d2a503b38a217815a0e2ccc4ed441f6e850ed5d47cfb"

View File

@@ -0,0 +1,34 @@
From 5690daf759b473b9d13b4547ef37adc2695cf524 Mon Sep 17 00:00:00 2001
From: James Cowgill <jcowgill@jcowgill.uk>
Date: Sun, 25 Feb 2018 14:23:25 +0000
Subject: [PATCH] Fix build with FFmpeg 4.0
Upstream-Status: Pending
Stolen from [1]
[1] https://git.archlinux.org/svntogit/community.git/tree/trunk/0001-Fix-build-with-FFmpeg-4.0.patch?h=packages/aubio
---
src/io/source_avcodec.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
index ccdce807..8197445c 100644
--- a/src/io/source_avcodec.c
+++ b/src/io/source_avcodec.c
@@ -58,7 +58,11 @@
#include "fmat.h"
#include "source_avcodec.h"
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0)
#define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE
+#else
+#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
+#endif
struct _aubio_source_avcodec_t {
uint_t hop_size;
--
2.17.0