From 3c4e49187f836c3613dc27c2c6a0d14c2d12bea8 Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Wed, 2 Dec 2015 09:52:03 +0100 Subject: [PATCH] libavcodec/aacsbr_tablegen: fix tablegen on windows Including these headers is not needed and breaks building on Windows as it tries to activate the full compat tools, which are not needed for host tools. --- libavcodec/aacsbr_fixed_tablegen.c | 3 --- libavcodec/aacsbr_tablegen.c | 3 --- libavcodec/aacsbr_tablegen_common.h | 3 ++- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libavcodec/aacsbr_fixed_tablegen.c b/libavcodec/aacsbr_fixed_tablegen.c index b896d75880..832fcb7a6d 100644 --- a/libavcodec/aacsbr_fixed_tablegen.c +++ b/libavcodec/aacsbr_fixed_tablegen.c @@ -21,9 +21,6 @@ */ #include -#include "libavutil/internal.h" -#include "libavutil/common.h" -#undef CONFIG_HARDCODED_TABLES #define CONFIG_HARDCODED_TABLES 0 #define USE_FIXED 1 #include "aacsbr_fixed_tablegen.h" diff --git a/libavcodec/aacsbr_tablegen.c b/libavcodec/aacsbr_tablegen.c index ee0d818f81..c331c57673 100644 --- a/libavcodec/aacsbr_tablegen.c +++ b/libavcodec/aacsbr_tablegen.c @@ -21,9 +21,6 @@ */ #include -#include "libavutil/internal.h" -#include "libavutil/common.h" -#undef CONFIG_HARDCODED_TABLES #define CONFIG_HARDCODED_TABLES 0 #define USE_FIXED 0 #include "aacsbr_tablegen.h" diff --git a/libavcodec/aacsbr_tablegen_common.h b/libavcodec/aacsbr_tablegen_common.h index 0a64552ed6..d7fc3061b0 100644 --- a/libavcodec/aacsbr_tablegen_common.h +++ b/libavcodec/aacsbr_tablegen_common.h @@ -22,7 +22,8 @@ #ifndef AVCODEC_AACSBR_TABLEGEN_COMMON_H #define AVCODEC_AACSBR_TABLEGEN_COMMON_H -#include "aac.h" +#include "aac_defines.h" +#include "libavutil/mem.h" #if CONFIG_HARDCODED_TABLES #define aacsbr_tableinit()