From e7f7c4b2d337b69292761513367af27801c6f986 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 11 Nov 2015 11:26:28 +0100
Subject: [PATCH] ffmpeg: add some alternate MIME types to the known demuxers

* These are the standard types used in HTML5 media, tell everyone that
  we can handle them.
* A few more green items in html5test.com, no extra points since none of
  the formats are mandatory however.
---
 .../media/plugins/ffmpeg/MuxerTable.cpp       | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp b/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
index ed22c4e303..da5a4878a3 100644
--- a/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
+++ b/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
@@ -174,6 +174,20 @@ const media_file_format gMuxerTable[] = {
 		"mp4",
 		{ 0 }
 	},
+	{
+		media_file_format::B_READABLE
+			| media_file_format::B_KNOWS_RAW_AUDIO
+			| media_file_format::B_KNOWS_ENCODED_AUDIO,
+		{ 0 },
+		B_QUICKTIME_FORMAT_FAMILY,
+		50,
+		{ 0 },
+		"audio/mp4",
+		"AAC in MPEG4 container",
+		"aac",
+		"aac",
+		{ 0 }
+	},
 	{
 		media_file_format::B_WRITABLE | media_file_format::B_READABLE
 			| media_file_format::B_KNOWS_ENCODED_VIDEO
@@ -242,11 +256,25 @@ const media_file_format gMuxerTable[] = {
 		100,
 		{ 0 },
 		"audio/ogg",
-		"Ogg (Xiph.Org Foundation)",
+		"Ogg Audio (Xiph.Org Foundation)",
 		"ogg",
 		"ogg",
 		{ 0 }
 	},
+	{
+		media_file_format::B_WRITABLE | media_file_format::B_READABLE
+			| media_file_format::B_KNOWS_ENCODED_VIDEO
+			| media_file_format::B_KNOWS_ENCODED_AUDIO,
+		{ 0 },
+		B_MISC_FORMAT_FAMILY,
+		50,
+		{ 0 },
+		"video/ogg",
+		"Ogg Video (Xiph.Org Foundation)",
+		"ogv",
+		"ogv",
+		{ 0 }
+	},
 	{
 		media_file_format::B_READABLE
 			| media_file_format::B_KNOWS_ENCODED_VIDEO
@@ -318,6 +346,20 @@ const media_file_format gMuxerTable[] = {
 		"webm",
 		{ 0 }
 	},
+	{
+		media_file_format::B_READABLE
+			| media_file_format::B_KNOWS_ENCODED_VIDEO
+			| media_file_format::B_KNOWS_ENCODED_AUDIO,
+		{ 0 },
+		B_MISC_FORMAT_FAMILY,
+		50,
+		{ 0 },
+		"audio/webm",
+		"WebM audio",
+		"webm",
+		"webm",
+		{ 0 }
+	},
 	{
 		media_file_format::B_READABLE
 			| media_file_format::B_KNOWS_RAW_AUDIO