aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2015-07-20 16:48:07 -0300
committerJames Almer <jamrial@gmail.com>2015-07-20 21:01:19 -0300
commit651448a8a7bdeecc96705e4020f7dfbf02afce9b (patch)
tree662ac9319242c76da9b1e8593b2070d4c9a9c11c
parenteca84946eaa13b5e65262f0d8786ff7ed31a51ac (diff)
downloadffmpeg-651448a8a7bdeecc96705e4020f7dfbf02afce9b.tar.gz
avcodec/aacsbr: fix compilation with hardcoded tables
Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavcodec/aacsbr_fixed_tablegen.c4
-rw-r--r--libavcodec/aacsbr_tablegen.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/aacsbr_fixed_tablegen.c b/libavcodec/aacsbr_fixed_tablegen.c
index 7117dbd0bb..b896d75880 100644
--- a/libavcodec/aacsbr_fixed_tablegen.c
+++ b/libavcodec/aacsbr_fixed_tablegen.c
@@ -21,9 +21,11 @@
*/
#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 "libavutil/common.h"
#include "aacsbr_fixed_tablegen.h"
#include "tableprint.h"
diff --git a/libavcodec/aacsbr_tablegen.c b/libavcodec/aacsbr_tablegen.c
index 4f58270aa2..ee0d818f81 100644
--- a/libavcodec/aacsbr_tablegen.c
+++ b/libavcodec/aacsbr_tablegen.c
@@ -21,9 +21,11 @@
*/
#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 "libavutil/common.h"
#include "aacsbr_tablegen.h"
#include "tableprint.h"