diff options
Diffstat (limited to 'apps/codecs/libFLAC/stream_decoder.c')
| -rw-r--r-- | apps/codecs/libFLAC/stream_decoder.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/apps/codecs/libFLAC/stream_decoder.c b/apps/codecs/libFLAC/stream_decoder.c index cbf57a1..7efe57b 100644 --- a/apps/codecs/libFLAC/stream_decoder.c +++ b/apps/codecs/libFLAC/stream_decoder.c @@ -299,14 +299,17 @@ FLAC_API FLAC__StreamDecoderState FLAC__stream_decoder_init(FLAC__StreamDecoder */ FLAC__cpu_info(&decoder->private_->cpuinfo); /* first default to the non-asm routines */ - decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal; decoder->private_->local_lpc_restore_signal_64bit = FLAC__lpc_restore_signal_wide; - decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal; -#if CONFIG_CPU==MCF5249 && !SIMULATOR - decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_order8_mac; +#if CONFIG_CPU==MCF5249 && !defined(SIMULATOR) + decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal_mcf5249; + decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_mcf5249; + decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_mcf5249; #else - decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal; + decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal; + decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal; + decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal; #endif + decoder->private_->local_lpc_restore_signal_64bit = FLAC__lpc_restore_signal_wide; /* now override with asm where appropriate */ #ifndef FLAC__NO_ASM if(decoder->private_->cpuinfo.use_asm) { |