[FFmpeg-cvslog] avcodec/aacsbr: fix compilation with hardcoded tables
James Almer
git at videolan.org
Tue Jul 21 02:01:42 CEST 2015
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Jul 20 16:48:07 2015 -0300| [651448a8a7bdeecc96705e4020f7dfbf02afce9b] | committer: James Almer
avcodec/aacsbr: fix compilation with hardcoded tables
Reviewed-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=651448a8a7bdeecc96705e4020f7dfbf02afce9b
---
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"
More information about the ffmpeg-cvslog
mailing list