remove a bad assert on cpuinfo struct

This commit is contained in:
Josh Coalson
2001-07-18 00:25:52 +00:00
parent 21aa17ee8e
commit 021ad3bb0f
2 changed files with 36 additions and 34 deletions

View File

@@ -218,20 +218,21 @@ FLAC__StreamDecoderState FLAC__stream_decoder_init(FLAC__StreamDecoder *decoder)
decoder->private->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal;
/* now override with asm where appropriate */
#ifndef FLAC__NO_ASM
FLAC__ASSERT(decoder->private->cpuinfo.use_asm);
if(decoder->private->cpuinfo.use_asm) {
#ifdef FLAC__CPU_IA32
FLAC__ASSERT(decoder->private->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
FLAC__ASSERT(decoder->private->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
#ifdef FLAC__HAS_NASM
if(decoder->private->cpuinfo.data.ia32.mmx) {
decoder->private->local_lpc_restore_signal = FLAC__lpc_restore_signal_asm_ia32;
decoder->private->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_asm_ia32_mmx;
}
else {
decoder->private->local_lpc_restore_signal = FLAC__lpc_restore_signal_asm_ia32;
decoder->private->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_asm_ia32;
}
if(decoder->private->cpuinfo.data.ia32.mmx) {
decoder->private->local_lpc_restore_signal = FLAC__lpc_restore_signal_asm_ia32;
decoder->private->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_asm_ia32_mmx;
}
else {
decoder->private->local_lpc_restore_signal = FLAC__lpc_restore_signal_asm_ia32;
decoder->private->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_asm_ia32;
}
#endif
#endif
}
#endif
return decoder->protected->state;