From 0e5af65c467b2423a0b857ae3ad98c91acc1e190 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Mon, 11 Nov 2019 11:38:02 +0100
Subject: Include patched FDK-AAC in the repository

The initial idea was to get the DAB+ patch into upstream, but since
that follows the android source releases, there is no place for a custom
DAB+ patch there.

So instead of having to maintain a patched fdk-aac that has to have the
same .so version as the distribution package on which it is installed,
we prefer having a separate fdk-aac-dab library to avoid collision.

At that point, there's no reason to keep fdk-aac in a separate
repository, as odr-audioenc is the only tool that needs DAB+ encoding
support. Including it here simplifies installation, and makes it
consistent with toolame-dab, also shipped in this repository.

DAB+ decoding support (needed by ODR-SourceCompanion, dablin, etisnoop,
welle.io and others) can be done using upstream FDK-AAC.
---
 src/AACDecoder.h     | 2 +-
 src/odr-audioenc.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/AACDecoder.h b/src/AACDecoder.h
index 2c09548..28713c1 100644
--- a/src/AACDecoder.h
+++ b/src/AACDecoder.h
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include <fdk-aac/aacdecoder_lib.h>
+#include <aacdecoder_lib.h>
 #include <cstdint>
 #include <vector>
 #include "wavfile.h"
diff --git a/src/odr-audioenc.cpp b/src/odr-audioenc.cpp
index 9dd10ba..61317e5 100644
--- a/src/odr-audioenc.cpp
+++ b/src/odr-audioenc.cpp
@@ -80,7 +80,7 @@ extern "C" {
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
-#include "fdk-aac/aacenc_lib.h"
+#include "aacenc_lib.h"
 
 extern "C" {
 #include "fec/fec.h"
-- 
cgit v1.2.3