From ead61989722a675027cdcb10e9adce20a5a2e3d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Thu, 7 Jan 2010 01:08:43 +0000 Subject: [PATCH] Enable Matroska container for testing purposes. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34925 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp b/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp index 882704f83e..ecbddcc270 100644 --- a/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp +++ b/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp @@ -24,6 +24,22 @@ const media_file_format gMuxerTable[] = { "avi", { 0 } }, + { + media_file_format::B_WRITABLE + | media_file_format::B_KNOWS_RAW_VIDEO + | media_file_format::B_KNOWS_RAW_AUDIO + | media_file_format::B_KNOWS_ENCODED_VIDEO + | media_file_format::B_KNOWS_ENCODED_AUDIO, + { 0 }, + B_AVI_FORMAT_FAMILY, + 100, + { 0 }, + "video/x-matroska", + "Matroska file format", + "mkv", + "mkv", + { 0 } + }, { media_file_format::B_WRITABLE | media_file_format::B_KNOWS_ENCODED_VIDEO