Merge pull request #15 from daschuer/faad2

Faad2 + CMake

CMakeLists.txt

@@ -1936,7 +1936,14 @@ endif()
 # FAAD AAC audio file decoder plugin
 find_package(MP4)
 find_package(MP4v2)
-option(FAAD "FAAD AAC audio file decoder support" OFF)
+# It is enabled by default on Linux only, because other targets have other solutions.
+# Used FAAD_DEFAULT because the complex expression is not supported by cmake_dependent_option()
+if(UNIX AND NOT APPLE AND (MP4_FOUND OR MP4v2_FOUND))
+  set(FAAD_DEFAULT TRUE)
+else()
+  set(FAAD_DEFAULT FALSE)
+endif()
+cmake_dependent_option(FAAD "FAAD AAC audio file decoder support" ON "FAAD_DEFAULT" OFF)
 if(FAAD)
   if(NOT MP4_FOUND AND NOT MP4v2_FOUND)
     message(FATAL_ERROR "FAAD AAC audio support requires libmp4 or libmp4v2 with development headers.")

src/sources/libfaadloader.cpp

@@ -86,8 +86,7 @@ LibLoader::LibLoader()
             !m_neAACDecClose ||
             !m_neAACDecPostSeekReset ||
             !m_neAACDecDecode2 ||
-            !m_neAACDecGetErrorMessage ||
-            !m_neAACDecGetVersion) {
+            !m_neAACDecGetErrorMessage) {
         kLogger.warning() << "NeAACDecOpen:" << m_neAACDecOpen;
         kLogger.warning() << "NeAACDecGetCurrentConfiguration:" << m_neAACDecGetCurrentConfiguration;
         kLogger.warning() << "NeAACDecSetConfiguration:" << m_neAACDecSetConfiguration;
@@ -97,7 +96,7 @@ LibLoader::LibLoader()
         kLogger.warning() << "NeAACDecPostSeekReset:" << m_neAACDecPostSeekReset;
         kLogger.warning() << "NeAACDecDecode2:" << m_neAACDecDecode2;
         kLogger.warning() << "NeAACDecGetErrorMessage:" << m_neAACDecGetErrorMessage;
-        kLogger.warning() << "NeAACDecGetVersion:" << m_neAACDecGetVersion;
+        kLogger.warning() << "NeAACDecGetVersion:" << m_neAACDecGetVersion; // From FAAD 2.8.2
         m_neAACDecOpen = nullptr;
         m_neAACDecGetCurrentConfiguration = nullptr;
         m_neAACDecSetConfiguration = nullptr;