1. ffmpeg
  2. Commit 3c4e49187f836c3613dc27c2c6a0d14c2d12bea8
Browse code

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.

Hendrik Leppkes authored on 2015/12/02 17:52:03
Showing 3 changed files
libavcodec/aacsbr_fixed_tablegen.c
History View file @ 3c4e491
... ... 
@@ -21,9 +21,6 @@
21 21 
  */
22 22
23 23 
 #include <stdlib.h>
24 
-#include "libavutil/internal.h"
25 
-#include "libavutil/common.h"
26 
-#undef CONFIG_HARDCODED_TABLES
27 24 
 #define CONFIG_HARDCODED_TABLES 0
28 25 
 #define USE_FIXED 1
29 26 
 #include "aacsbr_fixed_tablegen.h"
libavcodec/aacsbr_tablegen.c
History View file @ 3c4e491
... ... 
@@ -21,9 +21,6 @@
21 21 
  */
22 22
23 23 
 #include <stdlib.h>
24 
-#include "libavutil/internal.h"
25 
-#include "libavutil/common.h"
26 
-#undef CONFIG_HARDCODED_TABLES
27 24 
 #define CONFIG_HARDCODED_TABLES 0
28 25 
 #define USE_FIXED 0
29 26 
 #include "aacsbr_tablegen.h"
libavcodec/aacsbr_tablegen_common.h
History View file @ 3c4e491
... ... 
@@ -22,7 +22,8 @@
22 22
23 23 
 #ifndef AVCODEC_AACSBR_TABLEGEN_COMMON_H
24 24 
 #define AVCODEC_AACSBR_TABLEGEN_COMMON_H
25 
-#include "aac.h"
25 
+#include "aac_defines.h"
26 
+#include "libavutil/mem.h"
26 27
27 28 
 #if CONFIG_HARDCODED_TABLES
28 29 
 #define aacsbr_tableinit()