aboutsummaryrefslogtreecommitdiffstats
path: root/src/mp4_decode.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/mp4_decode.c7
1 files changed, 5 insertions, 2 deletions
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;