From f149f6bc0ebcd7856813934a457deae17159a174 Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Wed, 7 Dec 2016 16:06:48 +0100 Subject: [PATCH] fdkaac: fix the build for older fdkaac versions Support for 7.1 was added in 0.1.14. --- configure.ac | 8 ++++++-- ext/fdkaac/gstfdkaacenc.c | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 2f514fc061..1ec848d7de 100644 --- a/configure.ac +++ b/configure.ac @@ -2376,8 +2376,12 @@ AG_GST_CHECK_FEATURE(FBDEV, [linux framebuffer], fbdevsink, [ dnl *** fdkaac *** translit(dnm, m, l) AM_CONDITIONAL(USE_FDK_AAC, true) AG_GST_CHECK_FEATURE(FDK_AAC, [fdkaac plugin], fdkaac, [ - PKG_CHECK_MODULES(FDK_AAC, fdk-aac, HAVE_FDK_AAC="yes", [ - HAVE_FDK_AAC="no" + PKG_CHECK_MODULES(FDK_AAC, fdk-aac >= 0.1.14, [ + HAVE_FDK_AAC="yes", + HAVE_FDK_AAC_0_1_14="yes" + AC_DEFINE(HAVE_FDK_AAC_0_1_14 1, [Define if we have fdk-aac >= 0.1.14]) + ],[ + PKG_CHECK_MODULES(FDK_AAC, fdk-aac, HAVE_FDK_AAC="yes", HAVE_FDK_AAC="no") ]) ]) diff --git a/ext/fdkaac/gstfdkaacenc.c b/ext/fdkaac/gstfdkaacenc.c index 8c6ff8bb92..5e67d8018a 100644 --- a/ext/fdkaac/gstfdkaacenc.c +++ b/ext/fdkaac/gstfdkaacenc.c @@ -92,7 +92,9 @@ static const struct GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, - GST_AUDIO_CHANNEL_POSITION_LFE1}}, { + GST_AUDIO_CHANNEL_POSITION_LFE1}} +#ifdef HAVE_FDK_AAC_0_1_14 + , { 8, MODE_7_1_REAR_SURROUND, { GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, @@ -111,6 +113,7 @@ static const struct GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_LFE1}} +#endif }; static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",