From 0c4d88d353901ecb4392970e2220fbe30939b6ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Wed, 8 Jul 2009 09:41:00 +0000 Subject: [PATCH] Added "mpegts" to the supported demuxers. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31456 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp b/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp index fb324a3fba..dc039fc751 100644 --- a/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp +++ b/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp @@ -41,12 +41,17 @@ static const DemuxerFormat gDemuxerTable[] = { // NOTE: Tested with a couple of files and only audio works ok. // On some files, the duration and time_base is detected incorrectly // by libavformat and those streams don't play at all. - "mpg", "MPEG (Motion Picture Experts Group)", "video/mpg", + "mpg", "MPEG (Motion Picture Experts Group)", "video/mpeg", B_MPEG_FORMAT_FAMILY, B_MPEG_FORMAT_FAMILY }, + { + // NOTE: keep this before "mpeg" so it detects "mpegts" first. + "mpegts", "MPEG (Motion Picture Experts Group)", "video/mpeg", + B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY + }, { // TODO: Also covers "mpegvideo", plus see above. - "mpeg", "MPEG (Motion Picture Experts Group)", "video/mpg", + "mpeg", "MPEG (Motion Picture Experts Group)", "video/mpeg", B_MPEG_FORMAT_FAMILY, B_MPEG_FORMAT_FAMILY }, {