diff options
| author | Max Kellermann <max@duempel.org> | 2014-07-11 22:40:28 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-07-11 22:40:28 +0200 |
| commit | ef9ef03b1ffd3241072b37796f8be6e7e2a15131 (patch) | |
| tree | 9bfe743be5cceb9097a3f35058a9ee327ea1c77c | |
| parent | ecb67a1ed16e93f5fe552b28631e517060115648 (diff) | |
| download | mpd-ef9ef03b1ffd3241072b37796f8be6e7e2a15131.tar.gz mpd-ef9ef03b1ffd3241072b37796f8be6e7e2a15131.tar.xz mpd-ef9ef03b1ffd3241072b37796f8be6e7e2a15131.zip | |
decoder/faad: use MAX_CHANNELS
.. instead of declaring a new constant.
| -rw-r--r-- | src/decoder/FaadDecoderPlugin.cxx | 6 |
1 files 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 <string.h> #include <unistd.h> -#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 */ |