diff options
-rw-r--r-- | apps/codecs/libtremor/asm_arm.h | 4 | ||||
-rw-r--r-- | apps/codecs/libtremor/asm_mcf5249.h | 5 | ||||
-rw-r--r-- | apps/codecs/libtremor/misc.h | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/apps/codecs/libtremor/asm_arm.h b/apps/codecs/libtremor/asm_arm.h index 683de7bf64..6f38efcd4b 100644 --- a/apps/codecs/libtremor/asm_arm.h +++ b/apps/codecs/libtremor/asm_arm.h | |||
@@ -216,7 +216,8 @@ static inline void vect_copy(ogg_int32_t *x, const ogg_int32_t *y, int n) | |||
216 | #endif | 216 | #endif |
217 | 217 | ||
218 | #endif | 218 | #endif |
219 | 219 | /* not used anymore */ | |
220 | /* | ||
220 | #ifndef _V_CLIP_MATH | 221 | #ifndef _V_CLIP_MATH |
221 | #define _V_CLIP_MATH | 222 | #define _V_CLIP_MATH |
222 | 223 | ||
@@ -234,6 +235,7 @@ static inline ogg_int32_t CLIP_TO_15(ogg_int32_t x) { | |||
234 | } | 235 | } |
235 | 236 | ||
236 | #endif | 237 | #endif |
238 | */ | ||
237 | 239 | ||
238 | #ifndef _V_LSP_MATH_ASM | 240 | #ifndef _V_LSP_MATH_ASM |
239 | #define _V_LSP_MATH_ASM | 241 | #define _V_LSP_MATH_ASM |
diff --git a/apps/codecs/libtremor/asm_mcf5249.h b/apps/codecs/libtremor/asm_mcf5249.h index b40a88a37f..c13255b933 100644 --- a/apps/codecs/libtremor/asm_mcf5249.h +++ b/apps/codecs/libtremor/asm_mcf5249.h | |||
@@ -251,15 +251,16 @@ void vect_mult_bw(ogg_int32_t *data, LOOKUP_T *window, int n) | |||
251 | #endif | 251 | #endif |
252 | 252 | ||
253 | #endif | 253 | #endif |
254 | 254 | /* not used anymore */ | |
255 | /* | ||
255 | #ifndef _V_CLIP_MATH | 256 | #ifndef _V_CLIP_MATH |
256 | #define _V_CLIP_MATH | 257 | #define _V_CLIP_MATH |
257 | 258 | ||
258 | /* this is portable C and simple; why not use this as default? */ | ||
259 | static inline ogg_int32_t CLIP_TO_15(register ogg_int32_t x) { | 259 | static inline ogg_int32_t CLIP_TO_15(register ogg_int32_t x) { |
260 | register ogg_int32_t hi=32767, lo=-32768; | 260 | register ogg_int32_t hi=32767, lo=-32768; |
261 | return (x>=hi ? hi : (x<=lo ? lo : x)); | 261 | return (x>=hi ? hi : (x<=lo ? lo : x)); |
262 | } | 262 | } |
263 | 263 | ||
264 | #endif | 264 | #endif |
265 | */ | ||
265 | #endif | 266 | #endif |
diff --git a/apps/codecs/libtremor/misc.h b/apps/codecs/libtremor/misc.h index a64a95d137..6b67740b0d 100644 --- a/apps/codecs/libtremor/misc.h +++ b/apps/codecs/libtremor/misc.h | |||
@@ -203,7 +203,8 @@ static inline void vect_copy(ogg_int32_t *x, const ogg_int32_t *y, int n) | |||
203 | #endif | 203 | #endif |
204 | 204 | ||
205 | #endif | 205 | #endif |
206 | 206 | /* not used anymore */ | |
207 | /* | ||
207 | #ifndef _V_CLIP_MATH | 208 | #ifndef _V_CLIP_MATH |
208 | #define _V_CLIP_MATH | 209 | #define _V_CLIP_MATH |
209 | 210 | ||
@@ -215,6 +216,7 @@ static inline ogg_int32_t CLIP_TO_15(ogg_int32_t x) { | |||
215 | } | 216 | } |
216 | 217 | ||
217 | #endif | 218 | #endif |
219 | */ | ||
218 | 220 | ||
219 | static inline ogg_int32_t VFLOAT_MULT(ogg_int32_t a,ogg_int32_t ap, | 221 | static inline ogg_int32_t VFLOAT_MULT(ogg_int32_t a,ogg_int32_t ap, |
220 | ogg_int32_t b,ogg_int32_t bp, | 222 | ogg_int32_t b,ogg_int32_t bp, |