Skip to content

V
vlc-2-2
Commit b2f1b663 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

faad: cosmetic

parent ee66aa20
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
modules/codec/faad.c
View file @ b2f1b663
...@@ -146,10 +146,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -146,10 +146,7 @@ static int Open( vlc_object_t *p_this )
date_Set( &p_sys->date, 0 ); date_Set( &p_sys->date, 0 );
p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_cat = AUDIO_ES;
if (HAVE_FPU) p_dec->fmt_out.i_codec = HAVE_FPU ? VLC_CODEC_FL32 : VLC_CODEC_S16N;
p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
else
p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
p_dec->pf_decode_audio = DecodeBlock; p_dec->pf_decode_audio = DecodeBlock;
p_dec->fmt_out.audio.i_physical_channels = p_dec->fmt_out.audio.i_physical_channels =
...@@ -187,10 +184,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -187,10 +184,7 @@ static int Open( vlc_object_t *p_this )
/* Set the faad config */ /* Set the faad config */
cfg = faacDecGetCurrentConfiguration( p_sys->hfaad ); cfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
if (HAVE_FPU) cfg->outputFormat = HAVE_FPU ? FAAD_FMT_FLOAT : FAAD_FMT_16BIT;
cfg->outputFormat = FAAD_FMT_FLOAT;
else
cfg->outputFormat = FAAD_FMT_16BIT;
faacDecSetConfiguration( p_sys->hfaad, cfg ); faacDecSetConfiguration( p_sys->hfaad, cfg );
/* buffer */ /* buffer */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment