aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2019-08-21 15:59:19 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2019-08-21 15:59:19 +0200
commit2475666652ca54cf3b53f5837ab5e97f69593397 (patch)
tree091fda307533a3ee09414e7870da28717c8d4e0d
parentfa5f92318e7cc08ac872be18d47387cf83c23cd0 (diff)
downloadODR-AudioEnc-2475666652ca54cf3b53f5837ab5e97f69593397.tar.gz
ODR-AudioEnc-2475666652ca54cf3b53f5837ab5e97f69593397.tar.bz2
ODR-AudioEnc-2475666652ca54cf3b53f5837ab5e97f69593397.zip
Rename Config.h to EDIConfig.h
-rw-r--r--Makefile.am2
-rw-r--r--contrib/edi/EDIConfig.h (renamed from contrib/edi/Config.h)0
-rw-r--r--contrib/edi/PFT.h2
-rw-r--r--contrib/edi/Transport.h2
4 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 0105831..fc2c51b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,7 +119,7 @@ odr_audioenc_SOURCES = src/odr-audioenc.cpp \
contrib/ThreadsafeQueue.h \
contrib/edi/AFPacket.cpp \
contrib/edi/AFPacket.h \
- contrib/edi/Config.h \
+ contrib/edi/EDIConfig.h \
contrib/edi/Interleaver.cpp \
contrib/edi/Interleaver.h \
contrib/edi/PFT.cpp \
diff --git a/contrib/edi/Config.h b/contrib/edi/EDIConfig.h
index ca76322..ca76322 100644
--- a/contrib/edi/Config.h
+++ b/contrib/edi/EDIConfig.h
diff --git a/contrib/edi/PFT.h b/contrib/edi/PFT.h
index 0ff4839..502aa39 100644
--- a/contrib/edi/PFT.h
+++ b/contrib/edi/PFT.h
@@ -40,7 +40,7 @@
#include "AFPacket.h"
#include "Log.h"
#include "ReedSolomon.h"
-#include "Config.h"
+#include "EDIConfig.h"
namespace edi {
diff --git a/contrib/edi/Transport.h b/contrib/edi/Transport.h
index 325acf8..df6fe56 100644
--- a/contrib/edi/Transport.h
+++ b/contrib/edi/Transport.h
@@ -28,7 +28,7 @@
#pragma once
#include "config.h"
-#include "Config.h"
+#include "EDIConfig.h"
#include "AFPacket.h"
#include "PFT.h"
#include "Interleaver.h"