i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Use the same GCC flags for GCC4 that configure in the FFmpeg source

Browse 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
This commit is contained in:
Stephan Aßmus
2010-09-20 19:03:03 +00:00
parent d3aadcff6c
commit b145959bdd
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
+3 -3
View File
@@ -27,12 +27,12 @@ extern "C" {
#include "gfx_util.h" #include "gfx_util.h"
//#define TRACE_AVFORMAT_READER #define TRACE_AVFORMAT_READER
#ifdef TRACE_AVFORMAT_READER #ifdef TRACE_AVFORMAT_READER
# define TRACE printf # define TRACE printf
# define TRACE_IO(a...) # define TRACE_IO(a...)
# define TRACE_SEEK(a...) # define TRACE_SEEK(a...) printf(a)
# define TRACE_FIND(a...) # define TRACE_FIND(a...) printf(a)
# define TRACE_PACKET(a...) # define TRACE_PACKET(a...)
#else #else
# define TRACE(a...) # define TRACE(a...)
src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
+7 -7
View File
@@ -16,13 +16,13 @@ extern "C" {
static const DemuxerFormat gDemuxerTable[] = { static const DemuxerFormat gDemuxerTable[] = {
// { {
// // Tested with a limited number of streams. Some videos show bad // Tested with a limited number of streams. Some videos show bad
// // artifacts on keyframes with our own ASF Reader, while they play // artifacts on keyframes with our own ASF Reader, while they play
// // fine with this Reader. But seeking seems to be a problem. // fine with this Reader. But seeking seems to be a problem.
// "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 works very well, with many older // Tested with many streams and works very well, with many older
// files, the native AVI reader does not work. // files, the native AVI reader does not work.
src/add-ons/media/plugins/ffmpeg/Jamfile
+4 -2
View File
@@ -59,9 +59,11 @@ HAIKU_FFMPEG_USE_AMD3DNOW = 1 ;
HAIKU_FFMPEG_USE_AMD3DNOWEXT = 1 ; HAIKU_FFMPEG_USE_AMD3DNOWEXT = 1 ;
HAIKU_FFMPEG_GCC_EXTRA_FLAGS = ; HAIKU_FFMPEG_GCC_EXTRA_FLAGS = ;
if $(HAIKU_GCC_VERSION[1]) >= 3 { 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 { } 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 { if $(TARGET_ARCH) = x86 {