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

Switched support for AVI files from native Reader to

Browse Source 
FFmpeg plugin, which now works for much more files
in my testings.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38556 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2010-09-06 21:23:39 +00:00
parent f2d6b67836
commit d29fcc50b8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/jam/HaikuImage
View File

@ -140,7 +140,7 @@ SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon
#legacy.media_addon
;
SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder
aiff_reader asf_reader au_reader avi_reader $(X86_ONLY)ffmpeg
aiff_reader asf_reader au_reader $(X86_ONLY)ffmpeg
mov_reader musepack ogg raw_decoder speex
$(X86_ONLY)ape_reader
# theora

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

@ -23,13 +23,12 @@ static const DemuxerFormat gDemuxerTable[] = {
// "asf", "ASF Movie", "video/x-asf",
// B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY
// },
// {
// // Tested with many streams and either works ok, or has inconsistent
// // seeking results for audio, i.e. often audio is not in sync.
// // Keep using the avi_reader implementation by Marcus Overhagen.
// "avi", "AVI (Audio Video Interleaved)", "video/x-msvideo",
// B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY
// },
{
// Tested with many streams and works very well, with many older
// files, the native AVI reader does not work.
"avi", "AVI (Audio Video Interleaved)", "video/x-msvideo",
B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY
},
{
"dv", "DV Movie", "video/dv",
B_WAV_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY