diff options
Diffstat (limited to 'apps/codecs/libffmpegFLAC/shndec.c')
-rw-r--r-- | apps/codecs/libffmpegFLAC/shndec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/codecs/libffmpegFLAC/shndec.c b/apps/codecs/libffmpegFLAC/shndec.c index 61b3703188..1afcff6fbe 100644 --- a/apps/codecs/libffmpegFLAC/shndec.c +++ b/apps/codecs/libffmpegFLAC/shndec.c | |||
@@ -82,7 +82,7 @@ static unsigned int get_uint(ShortenContext *s, int k) | |||
82 | return get_ur_golomb_shorten(&s->gb, k); | 82 | return get_ur_golomb_shorten(&s->gb, k); |
83 | } | 83 | } |
84 | 84 | ||
85 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 85 | #if defined(CPU_COLDFIRE) |
86 | static void coldfire_lshift_samples(int n, int shift, int32_t *samples) ICODE_ATTR_FLAC; | 86 | static void coldfire_lshift_samples(int n, int shift, int32_t *samples) ICODE_ATTR_FLAC; |
87 | static void coldfire_lshift_samples(int n, int shift, int32_t *samples) | 87 | static void coldfire_lshift_samples(int n, int shift, int32_t *samples) |
88 | { | 88 | { |
@@ -132,7 +132,7 @@ static inline void fix_bitshift(ShortenContext *s, int32_t *samples) | |||
132 | /* Wrapped samples don't get bitshifted, so we'll do them during | 132 | /* Wrapped samples don't get bitshifted, so we'll do them during |
133 | the next iteration. */ | 133 | the next iteration. */ |
134 | if (s->bitshift != 0) { | 134 | if (s->bitshift != 0) { |
135 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 135 | #if defined(CPU_COLDFIRE) |
136 | coldfire_lshift_samples(s->blocksize, s->bitshift, samples - s->nwrap); | 136 | coldfire_lshift_samples(s->blocksize, s->bitshift, samples - s->nwrap); |
137 | #else | 137 | #else |
138 | for (i = -s->nwrap; i < (s->blocksize - s->nwrap); i++) | 138 | for (i = -s->nwrap; i < (s->blocksize - s->nwrap); i++) |
@@ -349,7 +349,7 @@ int shorten_decode_frames(ShortenContext *s, int *nsamples, | |||
349 | 349 | ||
350 | /* Scale the samples for the pcmbuf */ | 350 | /* Scale the samples for the pcmbuf */ |
351 | int scale = SHN_OUTPUT_DEPTH - s->bits_per_sample; | 351 | int scale = SHN_OUTPUT_DEPTH - s->bits_per_sample; |
352 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 352 | #if defined(CPU_COLDFIRE) |
353 | coldfire_lshift_samples(*nsamples, scale, decoded0 + s->nwrap); | 353 | coldfire_lshift_samples(*nsamples, scale, decoded0 + s->nwrap); |
354 | coldfire_lshift_samples(*nsamples, scale, decoded1 + s->nwrap); | 354 | coldfire_lshift_samples(*nsamples, scale, decoded1 + s->nwrap); |
355 | #else | 355 | #else |