From e8d8bd4c0db6322932b331638007e6f277a7e2bb Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 5 Nov 2010 02:01:35 +0100
Subject: [PATCH] decoder/{mp4ff,ffmpeg}: add extension ".m4b" (audio book)
Same as ".m4a".
---
NEWS | 3 +++
src/decoder/ffmpeg_plugin.c | 4 +++-
src/decoder/mp4ff_plugin.c | 8 +++++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index 65c5def28..276956be0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
ver 0.15.14 (2010/??/??)
* output_thread: fix assertion failure due to race condition in OPEN
+* decoders:
+ - mp4ff, ffmpeg: add extension ".m4b" (audio book)
+
ver 0.15.13 (2010/10/10)
* output_thread: fix race condition after CANCEL command
diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c
index 9bae39793..10894b633 100644
--- a/src/decoder/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_plugin.c
@@ -501,7 +501,9 @@ static const char *const ffmpeg_suffixes[] = {
"atrac", "au", "aud", "avi", "avm2", "avs", "bap", "bfi", "c93", "cak",
"cin", "cmv", "cpk", "daud", "dct", "divx", "dts", "dv", "dvd", "dxa",
"eac3", "film", "flac", "flc", "fli", "fll", "flx", "flv", "g726",
- "gsm", "gxf", "iss", "m1v", "m2v", "m2t", "m2ts", "m4a", "m4v", "mad",
+ "gsm", "gxf", "iss", "m1v", "m2v", "m2t", "m2ts",
+ "m4a", "m4b", "m4v",
+ "mad",
"mj2", "mjpeg", "mjpg", "mka", "mkv", "mlp", "mm", "mmf", "mov", "mp+",
"mp1", "mp2", "mp3", "mp4", "mpc", "mpeg", "mpg", "mpga", "mpp", "mpu",
"mve", "mvi", "mxf", "nc", "nsv", "nut", "nuv", "oga", "ogm", "ogv",
diff --git a/src/decoder/mp4ff_plugin.c b/src/decoder/mp4ff_plugin.c
index d5afe084b..4d4d47c6c 100644
--- a/src/decoder/mp4ff_plugin.c
+++ b/src/decoder/mp4ff_plugin.c
@@ -425,7 +425,13 @@ mp4_tag_dup(const char *file)
return ret;
}
-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 = {