diff options
Diffstat (limited to 'apps/codecs/libwmavoice/libavutil')
-rw-r--r-- | apps/codecs/libwmavoice/libavutil/avutil.h | 8 | ||||
-rw-r--r-- | apps/codecs/libwmavoice/libavutil/mathematics.c | 2 | ||||
-rw-r--r-- | apps/codecs/libwmavoice/libavutil/mathematics.h | 6 | ||||
-rw-r--r-- | apps/codecs/libwmavoice/libavutil/mem.c | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/apps/codecs/libwmavoice/libavutil/avutil.h b/apps/codecs/libwmavoice/libavutil/avutil.h index 50b29fc4a7..457829ac7f 100644 --- a/apps/codecs/libwmavoice/libavutil/avutil.h +++ b/apps/codecs/libwmavoice/libavutil/avutil.h | |||
@@ -79,11 +79,11 @@ enum AVMediaType { | |||
79 | }; | 79 | }; |
80 | 80 | ||
81 | #include "common.h" | 81 | #include "common.h" |
82 | #include "error.h" | 82 | //#include "error.h" |
83 | #include "mathematics.h" | 83 | #include "mathematics.h" |
84 | #include "rational.h" | 84 | //#include "rational.h" |
85 | #include "intfloat_readwrite.h" | 85 | //#include "intfloat_readwrite.h" |
86 | #include "log.h" | 86 | #include "log.h" |
87 | #include "pixfmt.h" | 87 | //#include "pixfmt.h" |
88 | 88 | ||
89 | #endif /* AVUTIL_AVUTIL_H */ | 89 | #endif /* AVUTIL_AVUTIL_H */ |
diff --git a/apps/codecs/libwmavoice/libavutil/mathematics.c b/apps/codecs/libwmavoice/libavutil/mathematics.c index c6851cb755..c4fbe3b7bc 100644 --- a/apps/codecs/libwmavoice/libavutil/mathematics.c +++ b/apps/codecs/libwmavoice/libavutil/mathematics.c | |||
@@ -130,6 +130,7 @@ int64_t av_rescale(int64_t a, int64_t b, int64_t c){ | |||
130 | return av_rescale_rnd(a, b, c, AV_ROUND_NEAR_INF); | 130 | return av_rescale_rnd(a, b, c, AV_ROUND_NEAR_INF); |
131 | } | 131 | } |
132 | 132 | ||
133 | #if 0 | ||
133 | int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq){ | 134 | int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq){ |
134 | int64_t b= bq.num * (int64_t)cq.den; | 135 | int64_t b= bq.num * (int64_t)cq.den; |
135 | int64_t c= cq.num * (int64_t)bq.den; | 136 | int64_t c= cq.num * (int64_t)bq.den; |
@@ -143,6 +144,7 @@ int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b){ | |||
143 | if (av_rescale_rnd(ts_b, b, a, AV_ROUND_DOWN) < ts_a) return 1; | 144 | if (av_rescale_rnd(ts_b, b, a, AV_ROUND_DOWN) < ts_a) return 1; |
144 | return 0; | 145 | return 0; |
145 | } | 146 | } |
147 | #endif | ||
146 | 148 | ||
147 | int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod){ | 149 | int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod){ |
148 | int64_t c= (a-b) & (mod-1); | 150 | int64_t c= (a-b) & (mod-1); |
diff --git a/apps/codecs/libwmavoice/libavutil/mathematics.h b/apps/codecs/libwmavoice/libavutil/mathematics.h index 882a516393..e07d4fe807 100644 --- a/apps/codecs/libwmavoice/libavutil/mathematics.h +++ b/apps/codecs/libwmavoice/libavutil/mathematics.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <stdint.h> | 24 | #include <stdint.h> |
25 | #include <math.h> | 25 | #include <math.h> |
26 | #include "attributes.h" | 26 | #include "attributes.h" |
27 | #include "rational.h" | 27 | //#include "rational.h" |
28 | 28 | ||
29 | #ifndef M_E | 29 | #ifndef M_E |
30 | #define M_E 2.7182818284590452354 /* e */ | 30 | #define M_E 2.7182818284590452354 /* e */ |
@@ -87,7 +87,7 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_cons | |||
87 | /** | 87 | /** |
88 | * Rescale a 64-bit integer by 2 rational numbers. | 88 | * Rescale a 64-bit integer by 2 rational numbers. |
89 | */ | 89 | */ |
90 | int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const; | 90 | //int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const; |
91 | 91 | ||
92 | /** | 92 | /** |
93 | * Compare 2 timestamps each in its own timebases. | 93 | * Compare 2 timestamps each in its own timebases. |
@@ -95,7 +95,7 @@ int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const; | |||
95 | * is outside the int64_t range when represented in the others timebase. | 95 | * is outside the int64_t range when represented in the others timebase. |
96 | * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position | 96 | * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position |
97 | */ | 97 | */ |
98 | int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b); | 98 | //int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b); |
99 | 99 | ||
100 | /** | 100 | /** |
101 | * Compare 2 integers modulo mod. | 101 | * Compare 2 integers modulo mod. |
diff --git a/apps/codecs/libwmavoice/libavutil/mem.c b/apps/codecs/libwmavoice/libavutil/mem.c index 8cad089a7d..a9a3283775 100644 --- a/apps/codecs/libwmavoice/libavutil/mem.c +++ b/apps/codecs/libwmavoice/libavutil/mem.c | |||
@@ -24,7 +24,7 @@ | |||
24 | * default memory allocator for libavutil | 24 | * default memory allocator for libavutil |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "config.h" | 27 | //#include "config.h" |
28 | 28 | ||
29 | #include <limits.h> | 29 | #include <limits.h> |
30 | #include <stdlib.h> | 30 | #include <stdlib.h> |