i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+1 -1
View File
@@ -140,7 +140,7 @@ SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon
#legacy.media_addon #legacy.media_addon
; ;
SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder 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 mov_reader musepack ogg raw_decoder speex
$(X86_ONLY)ape_reader $(X86_ONLY)ape_reader
# theora # theora
src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
+6 -7
View File
@@ -23,13 +23,12 @@ static const DemuxerFormat gDemuxerTable[] = {
// "asf", "ASF Movie", "video/x-asf", // "asf", "ASF Movie", "video/x-asf",
// B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY // B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY
// }, // },
// { {
// // Tested with many streams and either works ok, or has inconsistent // Tested with many streams and works very well, with many older
// // seeking results for audio, i.e. often audio is not in sync. // files, the native AVI reader does not work.
// // Keep using the avi_reader implementation by Marcus Overhagen. "avi", "AVI (Audio Video Interleaved)", "video/x-msvideo",
// "avi", "AVI (Audio Video Interleaved)", "video/x-msvideo", B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY
// B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY },
// },
{ {
"dv", "DV Movie", "video/dv", "dv", "DV Movie", "video/dv",
B_WAV_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY B_WAV_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY