aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-12-02 09:52:03 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-12-04 14:49:40 +0100
commit3c4e49187f836c3613dc27c2c6a0d14c2d12bea8 (patch)
tree2e0c8c0b4010b42f4f33e4496f48a6261dff8d60 /libavcodec
parent42a9aead854f3c89c072bb10225857da1239cb91 (diff)
downloadffmpeg-3c4e49187f836c3613dc27c2c6a0d14c2d12bea8.tar.gz
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.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aacsbr_fixed_tablegen.c3
-rw-r--r--libavcodec/aacsbr_tablegen.c3
-rw-r--r--libavcodec/aacsbr_tablegen_common.h3
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 <stdlib.h>
-#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 <stdlib.h>
-#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()