diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-01-28 16:19:23 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-02 01:47:01 +0100 |
| commit | e742bf3421f1a3077334ec0761ac2116c70e7a07 (patch) | |
| tree | 28648dafe008c811cd90dcfd75219e72d7fe8c73 | |
| parent | ff0618b5c4573765045bab58e4eecf4b1fe4d07e (diff) | |
| download | ffmpeg-e742bf3421f1a3077334ec0761ac2116c70e7a07.tar.gz | |
avcodec/aacps_fixed_tablegen: Don't include config.h
It is only valid for the target, not the host and therefore it must not
be included when building the tables when hardcoded tables are enabled.
Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavcodec/aacps_fixed_tablegen.h | 6 | ||||
| -rw-r--r-- | libavcodec/aacps_tablegen_template.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/aacps_fixed_tablegen.h b/libavcodec/aacps_fixed_tablegen.h index 356fb8b293..8fb1da5076 100644 --- a/libavcodec/aacps_fixed_tablegen.h +++ b/libavcodec/aacps_fixed_tablegen.h @@ -36,8 +36,12 @@ #else #include "libavutil/common.h" #include "libavutil/mathematics.h" -#include "libavutil/mem.h" +#ifdef BUILD_TABLES +#undef DECLARE_ALIGNED +#define DECLARE_ALIGNED(align, type, variable) type variable +#else #include "libavutil/mem_internal.h" +#endif #include "aac_defines.h" #include "libavutil/softfloat.h" diff --git a/libavcodec/aacps_tablegen_template.c b/libavcodec/aacps_tablegen_template.c index 341bd44409..e70edf884b 100644 --- a/libavcodec/aacps_tablegen_template.c +++ b/libavcodec/aacps_tablegen_template.c @@ -21,6 +21,7 @@ */ #include <stdlib.h> +#define BUILD_TABLES #define CONFIG_HARDCODED_TABLES 0 #include "aac_defines.h" |