From 590323e3411fb0db4e9f75f132a0b74ebe3eb3e3 Mon Sep 17 00:00:00 2001
From: Warren Dukes <warren.dukes@gmail.com>
Date: Sun, 21 Mar 2004 13:47:45 +0000
Subject: more faad autoconf checks

git-svn-id: https://svn.musicpd.org/mpd/trunk@342 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/mp4_decode.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/mp4_decode.c')

diff --git a/src/mp4_decode.c b/src/mp4_decode.c
index cf7fb6137..a2cfc2ee0 100644
--- a/src/mp4_decode.c
+++ b/src/mp4_decode.c
@@ -132,9 +132,12 @@ int mp4_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc) {
 
 	config = faacDecGetCurrentConfiguration(decoder);
 	config->outputFormat = FAAD_FMT_16BIT;
+#ifdef HAVE_FAACDECCONFIGURATION_DOWNMATRIX
 	config->downMatrix = 1;
-	/*comment this out, its not in faad2 2.0 rc2*/
-	/*config->dontUpSampleImplicitSBR = 0;*/
+#endif
+#ifdef HAVE_FAACDECCONFIGURATION_DONTUPSAMPLEIMPLICITSBR
+	config->dontUpSampleImplicitSBR = 0;
+#endif
 	faacDecSetConfiguration(decoder,config);
 
 	af->bits = 16;
-- 
cgit v1.2.3