From ef9ef03b1ffd3241072b37796f8be6e7e2a15131 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 11 Jul 2014 22:40:28 +0200 Subject: [PATCH] decoder/faad: use MAX_CHANNELS .. instead of declaring a new constant. --- src/decoder/FaadDecoderPlugin.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/decoder/FaadDecoderPlugin.cxx b/src/decoder/FaadDecoderPlugin.cxx index 9fd20167d..4d089c45f 100644 --- a/src/decoder/FaadDecoderPlugin.cxx +++ b/src/decoder/FaadDecoderPlugin.cxx @@ -34,8 +34,6 @@ #include #include -#define AAC_MAX_CHANNELS 6 - static const unsigned adts_sample_rates[] = { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350, 0, 0, 0 @@ -310,7 +308,7 @@ faad_get_file_time_float(InputStream &is) float length; buffer = decoder_buffer_new(nullptr, is, - FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS); + FAAD_MIN_STREAMSIZE * MAX_CHANNELS); length = faad_song_duration(buffer, is); if (length < 0) { @@ -366,7 +364,7 @@ faad_stream_decode(Decoder &mpd_decoder, InputStream &is) DecoderBuffer *buffer; buffer = decoder_buffer_new(&mpd_decoder, is, - FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS); + FAAD_MIN_STREAMSIZE * MAX_CHANNELS); total_time = faad_song_duration(buffer, is); /* create the libfaad decoder */