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
This commit is contained in:
Max Kellermann
2010-11-07 15:30:18 +01:00
11 changed files with 109 additions and 45 deletions

View File

@@ -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 = {