From b145959bddcc9b9ab7cd8acb380531a6f98f3a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Mon, 20 Sep 2010 19:03:03 +0000 Subject: [PATCH] * Use the same GCC flags for GCC4 that configure in the FFmpeg source itself generates. * For GCC2, FFmpeg uses -fPIC instead of -DPIC. Also disable SSE for GCC2, since that fixes a crash in the SSE version of clear_block(). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38747 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media/plugins/ffmpeg/AVFormatReader.cpp | 6 +++--- src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp | 14 +++++++------- src/add-ons/media/plugins/ffmpeg/Jamfile | 6 ++++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp index 706331601a..e376023e37 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp +++ b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp @@ -27,12 +27,12 @@ extern "C" { #include "gfx_util.h" -//#define TRACE_AVFORMAT_READER +#define TRACE_AVFORMAT_READER #ifdef TRACE_AVFORMAT_READER # define TRACE printf # define TRACE_IO(a...) -# define TRACE_SEEK(a...) -# define TRACE_FIND(a...) +# define TRACE_SEEK(a...) printf(a) +# define TRACE_FIND(a...) printf(a) # define TRACE_PACKET(a...) #else # define TRACE(a...) diff --git a/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp b/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp index 88351fa2f9..3b535b4b96 100644 --- a/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp +++ b/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp @@ -16,13 +16,13 @@ extern "C" { 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. diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile b/src/add-ons/media/plugins/ffmpeg/Jamfile index cede0232ba..e0111eec29 100644 --- a/src/add-ons/media/plugins/ffmpeg/Jamfile +++ b/src/add-ons/media/plugins/ffmpeg/Jamfile @@ -59,9 +59,11 @@ HAIKU_FFMPEG_USE_AMD3DNOW = 1 ; HAIKU_FFMPEG_USE_AMD3DNOWEXT = 1 ; HAIKU_FFMPEG_GCC_EXTRA_FLAGS = ; if $(HAIKU_GCC_VERSION[1]) >= 3 { - HAIKU_FFMPEG_GCC_EXTRA_FLAGS = -fomit-frame-pointer -fno-pic ; + HAIKU_FFMPEG_GCC_EXTRA_FLAGS = -fomit-frame-pointer -fno-pic + -fno-math-errno -fno-signed-zeros -fno-tree-vectorize ; } else { - HAIKU_FFMPEG_GCC_EXTRA_FLAGS = -fomit-frame-pointer -DPIC ; + HAIKU_FFMPEG_GCC_EXTRA_FLAGS = -fomit-frame-pointer -fPIC ; + HAIKU_FFMPEG_USE_SSE = 0 ; } if $(TARGET_ARCH) = x86 {