[FFmpeg-devel] [PATCH] avcodec/aacsbr: fix compilation with hardcoded tables

James Almer jamrial at gmail.com
Mon Jul 20 21:49:37 CEST 2015


Signed-off-by: James Almer <jamrial at gmail.com>
---
 libavcodec/aacsbr_fixed_tablegen.c | 4 +++-
 libavcodec/aacsbr_tablegen.c       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavcodec/aacsbr_fixed_tablegen.c b/libavcodec/aacsbr_fixed_tablegen.c
index 7117dbd..b896d75 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 4f58270..ee0d818 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"
 
-- 
2.4.5



More information about the ffmpeg-devel mailing list