diff options
| author | Max Kellermann <max@duempel.org> | 2010-11-07 15:30:18 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2010-11-07 15:30:18 +0100 |
| commit | 4478b3ef741eecf7ed0cf94179986c6f86a57287 (patch) | |
| tree | b10d931fa854e12d813ec796e16a45ae7af930e3 /src/decoder/mp4ff_decoder_plugin.c | |
| parent | 5a263206803556a600a75dd5e1813feb510af268 (diff) | |
| parent | dec7090198a0bbdd91ab8c531b84624f8bde4da9 (diff) | |
| download | mpd-4478b3ef741eecf7ed0cf94179986c6f86a57287.tar.gz mpd-4478b3ef741eecf7ed0cf94179986c6f86a57287.tar.xz mpd-4478b3ef741eecf7ed0cf94179986c6f86a57287.zip | |
Merge release 0.15.14 from branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
src/decoder_control.c
src/decoder_control.h
src/input/rewind_input_plugin.c
src/output_control.c
src/output_thread.c
src/player_thread.c
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/mp4ff_decoder_plugin.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/decoder/mp4ff_decoder_plugin.c b/src/decoder/mp4ff_decoder_plugin.c index ce4848409..861b08194 100644 --- a/src/decoder/mp4ff_decoder_plugin.c +++ b/src/decoder/mp4ff_decoder_plugin.c @@ -417,7 +417,13 @@ mp4_stream_tag(struct input_stream *is) return tag; } -static const char *const mp4_suffixes[] = { "m4a", "mp4", NULL }; +static const char *const mp4_suffixes[] = { + "m4a", + "m4b", + "mp4", + NULL +}; + static const char *const mp4_mime_types[] = { "audio/mp4", "audio/m4a", NULL }; const struct decoder_plugin mp4ff_decoder_plugin = { |