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/Mp4v2DecoderPlugin.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/Mp4v2DecoderPlugin.cxx')
| -rw-r--r-- | src/decoder/plugins/Mp4v2DecoderPlugin.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/decoder/plugins/Mp4v2DecoderPlugin.cxx b/src/decoder/plugins/Mp4v2DecoderPlugin.cxx index bf97763c5..34bccd243 100644 --- a/src/decoder/plugins/Mp4v2DecoderPlugin.cxx +++ b/src/decoder/plugins/Mp4v2DecoderPlugin.cxx @@ -39,15 +39,7 @@ static MP4TrackId mp4_get_aac_track(MP4FileHandle handle, NeAACDecHandle decoder, AudioFormat &audio_format, Error &error) { - 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_r = (unsigned long*)&sample_rate; -#else - uint32_t *sample_rate_r = sample_rate; -#endif + unsigned long sample_rate; const MP4TrackId tracks = MP4GetNumberOfTracks(handle); @@ -80,7 +72,7 @@ mp4_get_aac_track(MP4FileHandle handle, NeAACDecHandle decoder, uint8_t channels; int32_t nbytes = NeAACDecInit(decoder, buff, buff_size, - sample_rate_r, &channels); + &sample_rate, &channels); free(buff); |