Author: stippi Date: 2010-09-20 21:05:06 +0200 (Mon, 20 Sep 2010) New Revision: 38748 Changeset: http://dev.haiku-os.org/changeset/38748 Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp haiku/trunk/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp Log: Committed more than I intended to in the last commit. Sorry. Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp =================================================================== --- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp 2010-09-20 19:03:03 UTC (rev 38747) +++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp 2010-09-20 19:05:06 UTC (rev 38748) @@ -27,7 +27,7 @@ #include "gfx_util.h" -#define TRACE_AVFORMAT_READER +//#define TRACE_AVFORMAT_READER #ifdef TRACE_AVFORMAT_READER # define TRACE printf # define TRACE_IO(a...) Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp =================================================================== --- haiku/trunk/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp 2010-09-20 19:03:03 UTC (rev 38747) +++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp 2010-09-20 19:05:06 UTC (rev 38748) @@ -16,14 +16,14 @@ static const DemuxerFormat gDemuxerTable[] = { +// { +// // Tested with a limited number of streams. Some videos show bad +// // artifacts on keyframes with our own ASF Reader, while they play +// // fine with this Reader. But seeking seems to be a problem. +// "asf", "ASF Movie", "video/x-asf", +// B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY +// }, { - // Tested with a limited number of streams. Some videos show bad - // artifacts on keyframes with our own ASF Reader, while they play - // fine with this Reader. But seeking seems to be a problem. - "asf", "ASF Movie", "video/x-asf", - 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",