Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Changed pretty extractor names to sentence casing.

Browse Source 
* Enabled SWF demuxer in FFmpeg (though the one test file
   I have is compressed, which is not supported by the FFmpeg
   SWF demuxer...).
 * Removed testing TODOs for demuxers that I tested.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38761 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2010-09-21 16:00:50 +00:00
parent 40379e325c
commit d62aaeb68d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
View File

@ -34,17 +34,21 @@ static const DemuxerFormat gDemuxerTable[] = {
B_WAV_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY B_WAV_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY
}, },
{ {
"flac", "FLAC", "audio/x-flac", "flac", "Free Lossless Audio", "audio/x-flac",
B_WAV_FORMAT_FAMILY, B_ANY_FORMAT_FAMILY B_WAV_FORMAT_FAMILY, B_ANY_FORMAT_FAMILY
}, },
{ {
"flv", "Flash Video", "video/x-flv", "flv", "Flash video", "video/x-flv",
B_QUICKTIME_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY
},
{
"swf", "Shockwave video", "application/x-shockwave-flash",
B_QUICKTIME_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY B_QUICKTIME_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY
}, },
{ {
// Tested and appears to work ok with regards to video, // Tested and appears to work ok with regards to video,
// audio seems a problem. // audio seems a problem.
"matroska", "Matroska Movie", "video/x-matroska", "matroska", "Matroska movie", "video/x-matroska",
B_MISC_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY B_MISC_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY
}, },
// { // {
@ -54,7 +58,7 @@ static const DemuxerFormat gDemuxerTable[] = {
// }, // },
{ {
// Plays all files I could test with perfectly. // Plays all files I could test with perfectly.
"mp4", "MPEG-4 Movie", "video/x-mp4", "mp4", "MPEG-4 movie", "video/x-mp4",
B_QUICKTIME_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY B_QUICKTIME_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY
}, },
{ {
@ -81,7 +85,7 @@ static const DemuxerFormat gDemuxerTable[] = {
}, },
{ {
// TODO: untested! // TODO: untested!
"nsv", "NSV (NullSoft Video File)", "video/nsv", "nsv", "NSV (NullSoft video file)", "video/nsv",
B_QUICKTIME_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY B_QUICKTIME_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY
}, },
{ {
@ -93,12 +97,11 @@ static const DemuxerFormat gDemuxerTable[] = {
}, },
{ {
// TODO: untested! // TODO: untested!
"rm", "RM (RealVideo Clip)", "video/vnd.rn-realvideo", "rm", "RM (RealVideo clip)", "video/vnd.rn-realvideo",
B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY
}, },
{ {
// TODO: untested! "vob", "VOB movie", "video/x-vob",
"vob", "VOB Movie", "video/x-vob",
B_MPEG_FORMAT_FAMILY, B_MPEG_FORMAT_FAMILY B_MPEG_FORMAT_FAMILY, B_MPEG_FORMAT_FAMILY
}, },
{ {