From d946ade0255692fc6c014f2292d75ff34e1834fb Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 9 Apr 2014 14:00:08 +0200
Subject: [PATCH] ffmpeg: declare support for webm and 3gpp.

* Decoding works on the videos I tested with.
* Some videos on Youtube use these formats.
---
 .../media/plugins/ffmpeg/MuxerTable.cpp       | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp b/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
index e9db5b0bd6..b759229adb 100644
--- a/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
+++ b/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
@@ -8,6 +8,20 @@
 
 
 const media_file_format gMuxerTable[] = {
+	{
+		media_file_format::B_READABLE
+			| media_file_format::B_KNOWS_ENCODED_VIDEO
+			| media_file_format::B_KNOWS_ENCODED_AUDIO,
+		{ 0 },
+		B_MISC_FORMAT_FAMILY,
+		100,
+		{ 0 },
+		"video/3gpp",
+		"3GPP video",
+		"3gp",
+		"3gp",
+		{ 0 }
+	},
 	{
 		media_file_format::B_READABLE
 			| media_file_format::B_KNOWS_RAW_AUDIO
@@ -290,6 +304,20 @@ const media_file_format gMuxerTable[] = {
 		"wav",
 		{ 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,
+		100,
+		{ 0 },
+		"video/webm",
+		"WebM movie",
+		"webm",
+		"webm",
+		{ 0 }
+	},
 };
 
 const size_t gMuxerCount = sizeof(gMuxerTable) / sizeof(media_file_format);