vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed May 22 20:24:54 2013 +0300| [b2f1b6637edf2fc69fa56cc2577c366613a47578] | committer: Rémi Denis-Courmont
faad: cosmetic > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b2f1b6637edf2fc69fa56cc2577c366613a47578 --- modules/codec/faad.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/codec/faad.c b/modules/codec/faad.c index 2e58569..664ce0e 100644 --- a/modules/codec/faad.c +++ b/modules/codec/faad.c @@ -146,10 +146,7 @@ static int Open( vlc_object_t *p_this ) date_Set( &p_sys->date, 0 ); p_dec->fmt_out.i_cat = AUDIO_ES; - 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 = HAVE_FPU ? VLC_CODEC_FL32 : VLC_CODEC_S16N; p_dec->pf_decode_audio = DecodeBlock; p_dec->fmt_out.audio.i_physical_channels = @@ -187,10 +184,7 @@ static int Open( vlc_object_t *p_this ) /* Set the faad config */ cfg = faacDecGetCurrentConfiguration( p_sys->hfaad ); - if (HAVE_FPU) - cfg->outputFormat = FAAD_FMT_FLOAT; - else - cfg->outputFormat = FAAD_FMT_16BIT; + cfg->outputFormat = HAVE_FPU ? FAAD_FMT_FLOAT : FAAD_FMT_16BIT; faacDecSetConfiguration( p_sys->hfaad, cfg ); /* buffer */ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
