git.videolan.org
/
vlc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HAVE_FPU: make constant
[vlc.git]
/
modules
/
codec
/
faad.c
diff --git
a/modules/codec/faad.c
b/modules/codec/faad.c
index
6dbd499
..
f53265c
100644
(file)
--- a/
modules/codec/faad.c
+++ b/
modules/codec/faad.c
@@
-138,7
+138,7
@@
static int Open( vlc_object_t *p_this )
date_Set( &p_sys->date, 0 );
p_dec->fmt_out.i_cat = AUDIO_ES;
date_Set( &p_sys->date, 0 );
p_dec->fmt_out.i_cat = AUDIO_ES;
- if (
vlc_CPU() & CPU_CAPABILITY
_FPU)
+ if (
HAVE
_FPU)
p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
else
p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
else
p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
@@
-177,7
+177,7
@@
static int Open( vlc_object_t *p_this )
/* Set the faad config */
cfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
/* Set the faad config */
cfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
- if (
vlc_CPU() & CPU_CAPABILITY
_FPU)
+ if (
HAVE
_FPU)
cfg->outputFormat = FAAD_FMT_FLOAT;
else
cfg->outputFormat = FAAD_FMT_16BIT;
cfg->outputFormat = FAAD_FMT_FLOAT;
else
cfg->outputFormat = FAAD_FMT_16BIT;
@@
-483,7
+483,7
@@
static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
}
/* Do the actual reordering */
}
/* Do the actual reordering */
- if(
vlc_CPU() & CPU_CAPABILITY
_FPU )
+ if(
HAVE
_FPU )
for( i = 0; i < i_samples; i++ )
for( j = 0; j < i_nb_channels; j++ )
p_out[i * i_nb_channels + pi_chan_table[j]] =
for( i = 0; i < i_samples; i++ )
for( j = 0; j < i_nb_channels; j++ )
p_out[i * i_nb_channels + pi_chan_table[j]] =