Merge branch 'base' into master

[vlc] / modules / codec / faad.c

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 1f4f079d7c74731deefc4e7f0cf57f95d82e1dcd..3633bc893dfa6d6f89c72ecd7837845fc85980bb 100644 (file)
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -140,7 +140,7 @@ static int Open( vlc_object_t *p_this )
     if (vlc_CPU() & CPU_CAPABILITY_FPU)
         p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
     else
-        p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
+        p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
     p_dec->pf_decode_audio = DecodeBlock;
 
     p_dec->fmt_out.audio.i_physical_channels =