From be1140e1e53d10931bace46ede80f955e778c691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Mon, 17 May 2010 16:17:06 +0000 Subject: [PATCH] Added some more defines for demuxers that could in theory be enabled. But we have native implementations. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36844 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media/plugins/ffmpeg/DemuxerTable.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp b/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp index d9847b97b0..e5339d7fab 100644 --- a/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp +++ b/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp @@ -42,8 +42,18 @@ static const DemuxerFormat gDemuxerTable[] = { B_QUICKTIME_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY }, // { -// TODO: untested! -// "mov", "MOV (Quicktime Movie)", "video/x-mov", +// // Tested and appears to work ok with the one clip I have... +// "matroska", "Matroska Movie", "video/x-matroska", +// B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY +// }, +// { +// // Plays the limited amount of files I could test with. +// "mov", "Quicktime Movie", "video/x-mov", +// B_QUICKTIME_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY +// }, +// { +// // Plays the limited amount of files I could test with. +// "mp4", "MPEG-4 Movie", "video/x-mp4", // B_QUICKTIME_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY // }, // { @@ -64,7 +74,7 @@ static const DemuxerFormat gDemuxerTable[] = { B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY }, { - // TODO: Also covers "mpegvideo", plus see above. + // TODO: Also covers "mpegvideo", plus see mpegts. "mpeg", "MPEG (Motion Picture Experts Group)", "video/mpeg", B_MPEG_FORMAT_FAMILY, B_MPEG_FORMAT_FAMILY },