diff options
author | Brad Midgley <bmidgley@xmission.com> | 2008-01-28 18:00:51 +0000 |
---|---|---|
committer | Brad Midgley <bmidgley@xmission.com> | 2008-01-28 18:00:51 +0000 |
commit | 6d205fda030a21d99ea5064b9501d58a11b6efa5 (patch) | |
tree | e0953b86c3ec3820cdd4cf3ea79beaa3b55d6af7 /sbc/sbc.c | |
parent | 358888c52324aadb2d9814f2f5df5183706f70f7 (diff) |
revert arm conditional code
Diffstat (limited to 'sbc/sbc.c')
-rw-r--r-- | sbc/sbc.c | 13 |
1 files changed, 1 insertions, 12 deletions
@@ -708,15 +708,10 @@ static void sbc_encoder_init(struct sbc_encoder_state *state, state->position[0] = state->position[1] = 9 * frame->subbands; } -#ifdef __arm__ -void _sbc_analyze_four(const int16_t *in, int32_t *out) -{ - sbc_extended_t register res asm("r4"); -#else + static inline void _sbc_analyze_four(const int16_t *in, int32_t *out) { sbc_extended_t res; -#endif sbc_fixed_t t[8]; sbc_extended_t s[5]; @@ -799,15 +794,9 @@ static inline void sbc_analyze_four(struct sbc_encoder_state *state, state->position[ch] = 36; } -#ifdef __arm__ -void _sbc_analyze_eight(const int16_t *in, int32_t *out) -{ - sbc_extended_t register res asm("r4"); -#else static inline void _sbc_analyze_eight(const int16_t *in, int32_t *out) { sbc_extended_t res; -#endif sbc_fixed_t t[8]; sbc_extended_t s[8]; |