diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacps_tablegen.h | 1 | ||||
| -rw-r--r-- | libavcodec/cos_tablegen.c | 3 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 1 | ||||
| -rw-r--r-- | libavcodec/sinewin_tablegen.c | 3 | ||||
| -rw-r--r-- | libavcodec/twinvq_data.h | 2 |
5 files changed, 2 insertions, 8 deletions
diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aacps_tablegen.h index 70cc96c9d7..a8c4021756 100644 --- a/libavcodec/aacps_tablegen.h +++ b/libavcodec/aacps_tablegen.h @@ -23,6 +23,7 @@ #ifndef AACPS_TABLEGEN_H #define AACPS_TABLEGEN_H +#include <math.h> #include <stdint.h> #if CONFIG_HARDCODED_TABLES diff --git a/libavcodec/cos_tablegen.c b/libavcodec/cos_tablegen.c index 1577166a46..af9391dd20 100644 --- a/libavcodec/cos_tablegen.c +++ b/libavcodec/cos_tablegen.c @@ -24,9 +24,6 @@ #include <string.h> #include <math.h> -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif #define BITS 16 #define FLOATFMT "%.18e" #define FIXEDFMT "%6d" diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 92b19e23a2..f4d46190b6 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -167,7 +167,6 @@ static const AVOption options[]={ {"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, {"mpeg_quant", "use MPEG quantizers instead of H.263", OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"stats_out", NULL, OFFSET(stats_out), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX}, -{"stats_in", NULL, OFFSET(stats_in), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX}, {"qsquish", "how to keep quantizer between qmin and qmax (0 = clip, 1 = use differentiable function)", OFFSET(rc_qsquish), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, 0, 99, V|E}, {"rc_qmod_amp", "experimental quantizer modulation", OFFSET(rc_qmod_amp), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E}, {"rc_qmod_freq", "experimental quantizer modulation", OFFSET(rc_qmod_freq), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, diff --git a/libavcodec/sinewin_tablegen.c b/libavcodec/sinewin_tablegen.c index b2988d3160..561ae3ea1d 100644 --- a/libavcodec/sinewin_tablegen.c +++ b/libavcodec/sinewin_tablegen.c @@ -26,9 +26,6 @@ #define SINETABLE(size) \ float ff_sine_##size[size] #define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif #include "sinewin_tablegen.h" #include "tableprint.h" diff --git a/libavcodec/twinvq_data.h b/libavcodec/twinvq_data.h index 3042cd1beb..63911f85f4 100644 --- a/libavcodec/twinvq_data.h +++ b/libavcodec/twinvq_data.h @@ -135,7 +135,7 @@ static const uint16_t bark_tab_s44_128[] = { * * without risking a segfault on malformed files. */ -static const struct { +static const struct twinvq_data { float lsp08[504]; int16_t fcb08l[640]; int16_t fcb08m[320]; |