diff --git a/generated/Android/config.h b/generated/Android/config.h index c72277f..cdde374 100644 --- a/generated/Android/config.h +++ b/generated/Android/config.h @@ -441,7 +441,6 @@ #define CONFIG_LIBDC1394 0 #define CONFIG_LIBEBUR128 0 #define CONFIG_LIBFAAC 0 -#define CONFIG_LIBFDK_AAC 0 #define CONFIG_LIBFLITE 0 #define CONFIG_LIBFONTCONFIG 0 #define CONFIG_LIBFREETYPE 0 @@ -1093,7 +1092,6 @@ #define CONFIG_QDMC_AT_DECODER 0 #define CONFIG_QDM2_AT_DECODER 0 #define CONFIG_LIBCELT_DECODER 0 -#define CONFIG_LIBFDK_AAC_DECODER 0 #define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBILBC_DECODER 0 @@ -1532,7 +1530,6 @@ #define CONFIG_PCM_ALAW_AT_ENCODER 0 #define CONFIG_PCM_MULAW_AT_ENCODER 0 #define CONFIG_LIBFAAC_ENCODER 0 -#define CONFIG_LIBFDK_AAC_ENCODER 0 #define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 0 diff --git a/generated/IOs/config.h b/generated/IOs/config.h index 922407e..8499bdf 100644 --- a/generated/IOs/config.h +++ b/generated/IOs/config.h @@ -441,7 +441,6 @@ #define CONFIG_LIBDC1394 0 #define CONFIG_LIBEBUR128 0 #define CONFIG_LIBFAAC 0 -#define CONFIG_LIBFDK_AAC 0 #define CONFIG_LIBFLITE 0 #define CONFIG_LIBFONTCONFIG 0 #define CONFIG_LIBFREETYPE 0 @@ -1094,7 +1093,6 @@ #define CONFIG_QDMC_AT_DECODER 1 #define CONFIG_QDM2_AT_DECODER 1 #define CONFIG_LIBCELT_DECODER 0 -#define CONFIG_LIBFDK_AAC_DECODER 0 #define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBILBC_DECODER 0 @@ -1533,7 +1531,6 @@ #define CONFIG_PCM_ALAW_AT_ENCODER 1 #define CONFIG_PCM_MULAW_AT_ENCODER 1 #define CONFIG_LIBFAAC_ENCODER 0 -#define CONFIG_LIBFDK_AAC_ENCODER 0 #define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 0 diff --git a/generated/Linux/config.h b/generated/Linux/config.h index 0e39d73..1d0b19f 100644 --- a/generated/Linux/config.h +++ b/generated/Linux/config.h @@ -441,7 +441,6 @@ #define CONFIG_LIBDC1394 0 #define CONFIG_LIBEBUR128 0 #define CONFIG_LIBFAAC 0 -#define CONFIG_LIBFDK_AAC 0 #define CONFIG_LIBFLITE 0 #define CONFIG_LIBFONTCONFIG 0 #define CONFIG_LIBFREETYPE 0 @@ -1094,7 +1093,6 @@ #define CONFIG_QDMC_AT_DECODER 0 #define CONFIG_QDM2_AT_DECODER 0 #define CONFIG_LIBCELT_DECODER 0 -#define CONFIG_LIBFDK_AAC_DECODER 0 #define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBILBC_DECODER 0 @@ -1533,7 +1531,6 @@ #define CONFIG_PCM_ALAW_AT_ENCODER 0 #define CONFIG_PCM_MULAW_AT_ENCODER 0 #define CONFIG_LIBFAAC_ENCODER 0 -#define CONFIG_LIBFDK_AAC_ENCODER 0 #define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 0 diff --git a/generated/MacOs/config.h b/generated/MacOs/config.h index d6bfe38..0c6b386 100644 --- a/generated/MacOs/config.h +++ b/generated/MacOs/config.h @@ -441,7 +441,6 @@ #define CONFIG_LIBDC1394 0 #define CONFIG_LIBEBUR128 0 #define CONFIG_LIBFAAC 0 -#define CONFIG_LIBFDK_AAC 0 #define CONFIG_LIBFLITE 0 #define CONFIG_LIBFONTCONFIG 0 #define CONFIG_LIBFREETYPE 0 @@ -1094,7 +1093,6 @@ #define CONFIG_QDMC_AT_DECODER 0 #define CONFIG_QDM2_AT_DECODER 0 #define CONFIG_LIBCELT_DECODER 0 -#define CONFIG_LIBFDK_AAC_DECODER 0 #define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBILBC_DECODER 0 @@ -1533,7 +1531,6 @@ #define CONFIG_PCM_ALAW_AT_ENCODER 0 #define CONFIG_PCM_MULAW_AT_ENCODER 0 #define CONFIG_LIBFAAC_ENCODER 0 -#define CONFIG_LIBFDK_AAC_ENCODER 0 #define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 0 diff --git a/generated/Windows_32/config.h b/generated/Windows_32/config.h index 2e4f645..7bec1c6 100644 --- a/generated/Windows_32/config.h +++ b/generated/Windows_32/config.h @@ -441,7 +441,6 @@ #define CONFIG_LIBDC1394 0 #define CONFIG_LIBEBUR128 0 #define CONFIG_LIBFAAC 0 -#define CONFIG_LIBFDK_AAC 0 #define CONFIG_LIBFLITE 0 #define CONFIG_LIBFONTCONFIG 0 #define CONFIG_LIBFREETYPE 0 @@ -1094,7 +1093,6 @@ #define CONFIG_QDMC_AT_DECODER 0 #define CONFIG_QDM2_AT_DECODER 0 #define CONFIG_LIBCELT_DECODER 0 -#define CONFIG_LIBFDK_AAC_DECODER 0 #define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBILBC_DECODER 0 @@ -1533,7 +1531,6 @@ #define CONFIG_PCM_ALAW_AT_ENCODER 0 #define CONFIG_PCM_MULAW_AT_ENCODER 0 #define CONFIG_LIBFAAC_ENCODER 0 -#define CONFIG_LIBFDK_AAC_ENCODER 0 #define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 0 diff --git a/generated/Windows_64/config.h b/generated/Windows_64/config.h index 9619b9a..1a71b86 100644 --- a/generated/Windows_64/config.h +++ b/generated/Windows_64/config.h @@ -441,7 +441,6 @@ #define CONFIG_LIBDC1394 0 #define CONFIG_LIBEBUR128 0 #define CONFIG_LIBFAAC 0 -#define CONFIG_LIBFDK_AAC 0 #define CONFIG_LIBFLITE 0 #define CONFIG_LIBFONTCONFIG 0 #define CONFIG_LIBFREETYPE 0 @@ -1094,7 +1093,6 @@ #define CONFIG_QDMC_AT_DECODER 0 #define CONFIG_QDM2_AT_DECODER 0 #define CONFIG_LIBCELT_DECODER 0 -#define CONFIG_LIBFDK_AAC_DECODER 0 #define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBILBC_DECODER 0 @@ -1533,7 +1531,6 @@ #define CONFIG_PCM_ALAW_AT_ENCODER 0 #define CONFIG_PCM_MULAW_AT_ENCODER 0 #define CONFIG_LIBFAAC_ENCODER 0 -#define CONFIG_LIBFDK_AAC_ENCODER 0 #define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 0 diff --git a/lutinLib_ffmpegCommon.py b/lutinLib_ffmpegCommon.py index 2ec29bc..55b668f 100644 --- a/lutinLib_ffmpegCommon.py +++ b/lutinLib_ffmpegCommon.py @@ -21,7 +21,6 @@ def add_generate_path(target, my_module): def add_common_property(target, my_module): add_generate_path(target, my_module) - my_module.add_flag('c', [ "-D_ISOC99_SOURCE", "-D_FILE_OFFSET_BITS=64", diff --git a/lutin_ffmpeg-avcodec.py b/lutin_ffmpeg-avcodec.py index 333d7ee..a555ce2 100644 --- a/lutin_ffmpeg-avcodec.py +++ b/lutin_ffmpeg-avcodec.py @@ -968,6 +968,15 @@ def configure(target, my_module): else: debug.warning("unknow architecture ..."); + my_module.add_optionnal_depend('fdk-aac', + compilation_flags=["c", ["-DCONFIG_LIBFDK_AAC=1", "-DCONFIG_LIBFDK_AAC_DECODER=1", "-DCONFIG_LIBFDK_AAC_ENCODER=1"]], + compilation_flags_not_found=["c", ["-DCONFIG_LIBFDK_AAC=0", "-DCONFIG_LIBFDK_AAC_DECODER=0", "-DCONFIG_LIBFDK_AAC_ENCODER=0"]], + src_file=[ + 'ffmpeg/libavcodec/libfdk-aacenc.c', + 'ffmpeg/libavcodec/libfdk-aacdec.c' + ] + ) + #TODO : this is bad ... my_module.add_header_file([ 'ffmpeg/libavcodec/bsf_list.c',