[vlc-commits] Consider non-linear formats as more than 16-bits too

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct  2 21:12:34 2011 +0300| [be5567ca51936fdef807f29ef4230529cfd4da18] | committer: Rémi Denis-Courmont

Consider non-linear formats as more than 16-bits too

This should fix a regression on non-FPU builds whereby the built-in
downmix of some decoders was not used anymore.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=be5567ca51936fdef807f29ef4230529cfd4da18
---

 src/audio_output/output.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 6db331b..3959038 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -171,7 +171,7 @@ int aout_OutputNew( audio_output_t *p_aout,
     else
     /* Otherwise, audio filters will not work. Use fixed-point if the input has
      * more than 16-bits depth. */
-    if( p_format->i_bitspersample > 16 )
+    if( p_format->i_bitspersample > 16 || !AOUT_FMT_LINEAR(p_format))
         owner->mixer_format.i_format = VLC_CODEC_FI32;
     else
     /* Fallback to 16-bits. This avoids pointless conversion to and from