aboutsummaryrefslogtreecommitdiffstats
path: root/libFDK
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-09-09 14:07:55 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-09-10 20:35:45 +0200
commitd504da100d5af2577e34453ec591359df9baa926 (patch)
tree949ceb353933517d57e0b233778dab5b9b1af1b5 /libFDK
parentc89fb86cefb19ac9cf198c1e5cc31a85beab072e (diff)
downloadfdk-aac-d504da100d5af2577e34453ec591359df9baa926.tar.gz
fdk-aac-d504da100d5af2577e34453ec591359df9baa926.tar.bz2
fdk-aac-d504da100d5af2577e34453ec591359df9baa926.zip
Add DAB+ AOTs again and remove AOT_MP2 from code
Diffstat (limited to 'libFDK')
-rw-r--r--libFDK/src/FDK_tools_rom.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libFDK/src/FDK_tools_rom.cpp b/libFDK/src/FDK_tools_rom.cpp
index 29e37f2..36bf284 100644
--- a/libFDK/src/FDK_tools_rom.cpp
+++ b/libFDK/src/FDK_tools_rom.cpp
@@ -2554,6 +2554,9 @@ const element_list_t * getBitstreamElementList(AUDIO_OBJECT_TYPE aot, SCHAR epCo
case AOT_AAC_LC:
case AOT_SBR:
case AOT_PS:
+ case AOT_DABPLUS_AAC_LC:
+ case AOT_DABPLUS_SBR:
+ case AOT_DABPLUS_PS:
FDK_ASSERT(epConfig == -1);
if (nChannels == 1) {
return &node_aac_sce;