diff options
| -rw-r--r-- | doc/tablegen.txt | 1 | ||||
| -rw-r--r-- | libavcodec/mdct_tablegen.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegaudio_tablegen.h | 2 | ||||
| -rw-r--r-- | libavcodec/ps_tablegen.h | 11 |
4 files changed, 3 insertions, 13 deletions
diff --git a/doc/tablegen.txt b/doc/tablegen.txt index 8dfcd7d354..6fd0ae9a41 100644 --- a/doc/tablegen.txt +++ b/doc/tablegen.txt @@ -12,6 +12,7 @@ the tables as a header file using the tableprint.h helpers. Both of these files will be compiled for the host system, so to avoid breakage with cross-compilation neither of them may include, directly or indirectly, config.h or avconfig.h. +This means that e.g. libavutil/mathematics.h is ok but libavutil/libm.h is not. Due to this, the .c file or Makefile may have to provide additional defines or stubs, though if possible this should be avoided. In particular, CONFIG_HARDCODED_TABLES should always be defined to 0. diff --git a/libavcodec/mdct_tablegen.h b/libavcodec/mdct_tablegen.h index 1722c3b4d0..86f858b4c0 100644 --- a/libavcodec/mdct_tablegen.h +++ b/libavcodec/mdct_tablegen.h @@ -21,7 +21,7 @@ */ #include <assert.h> -// do not use libavutil/mathematics.h since this is compiled both +// do not use libavutil/libm.h since this is compiled both // for the host and the target and config.h is only valid for the target #include <math.h> #include "../libavutil/attributes.h" diff --git a/libavcodec/mpegaudio_tablegen.h b/libavcodec/mpegaudio_tablegen.h index 56bf408641..6b5ff2280e 100644 --- a/libavcodec/mpegaudio_tablegen.h +++ b/libavcodec/mpegaudio_tablegen.h @@ -24,8 +24,6 @@ #define MPEGAUDIO_TABLEGEN_H #include <stdint.h> -// do not use libavutil/mathematics.h since this is compiled both -// for the host and the target and config.h is only valid for the target #include <math.h> #define TABLE_4_3_SIZE (8191 + 16)*4 diff --git a/libavcodec/ps_tablegen.h b/libavcodec/ps_tablegen.h index a1773c987c..1d42377d54 100644 --- a/libavcodec/ps_tablegen.h +++ b/libavcodec/ps_tablegen.h @@ -24,22 +24,13 @@ #define PS_TABLEGEN_H #include <stdint.h> -#include <math.h> #if CONFIG_HARDCODED_TABLES #define ps_tableinit() #include "libavcodec/ps_tables.h" #else #include "../libavutil/common.h" -#ifndef M_SQRT1_2 -#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */ -#endif -#ifndef M_PI -#define M_PI 3.14159265358979323846 /* pi */ -#endif -#ifndef M_SQRT2 -#define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ -#endif +#include "../libavutil/mathematics.h" #define NR_ALLPASS_BANDS20 30 #define NR_ALLPASS_BANDS34 50 #define PS_AP_LINKS 3 |