diff options
| author | Max Kellermann <max@duempel.org> | 2014-11-02 14:06:05 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-11-02 14:06:05 +0100 |
| commit | 303d67aed2da79d4ddaa3a52093ed42ae9da064d (patch) | |
| tree | 060580f4c17b5d30d1e78e584df03c795ce4e1d7 /src/decoder/plugins/FaadDecoderPlugin.cxx | |
| parent | 575fbad254a1ce67530bf2aedc9852c89c072c3f (diff) | |
| parent | 6a7f6cdacd81877276563c42fdeacad3a8deface (diff) | |
| download | mpd-303d67aed2da79d4ddaa3a52093ed42ae9da064d.tar.gz mpd-303d67aed2da79d4ddaa3a52093ed42ae9da064d.tar.xz mpd-303d67aed2da79d4ddaa3a52093ed42ae9da064d.zip | |
Merge tag 'v0.19.2'
Diffstat (limited to 'src/decoder/plugins/FaadDecoderPlugin.cxx')
| -rw-r--r-- | src/decoder/plugins/FaadDecoderPlugin.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/decoder/plugins/FaadDecoderPlugin.cxx b/src/decoder/plugins/FaadDecoderPlugin.cxx index 793ab1011..add23aaa4 100644 --- a/src/decoder/plugins/FaadDecoderPlugin.cxx +++ b/src/decoder/plugins/FaadDecoderPlugin.cxx @@ -255,20 +255,12 @@ faad_decoder_init(NeAACDecHandle decoder, DecoderBuffer &buffer, } uint8_t channels; - uint32_t sample_rate; -#ifdef HAVE_FAAD_LONG - /* neaacdec.h declares all arguments as "unsigned long", but - internally expects uint32_t pointers. To avoid gcc - warnings, use this workaround. */ - unsigned long *sample_rate_p = (unsigned long *)(void *)&sample_rate; -#else - uint32_t *sample_rate_p = &sample_rate; -#endif + unsigned long sample_rate; long nbytes = NeAACDecInit(decoder, /* deconst hack, libfaad requires this */ const_cast<unsigned char *>(data.data), data.size, - sample_rate_p, &channels); + &sample_rate, &channels); if (nbytes < 0) { error.Set(faad_decoder_domain, "Not an AAC stream"); return false; |