[haiku-commits] r38747 - haiku/trunk/src/add-ons/media/plugins/ffmpeg
- From: superstippi@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 20 Sep 2010 21:03:03 +0200 (CEST)
Author: stippi
Date: 2010-09-20 21:03:03 +0200 (Mon, 20 Sep 2010)
New Revision: 38747
Changeset: http://dev.haiku-os.org/changeset/38747
Modified:
haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
haiku/trunk/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
haiku/trunk/src/add-ons/media/plugins/ffmpeg/Jamfile
Log:
* 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().
Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
2010-09-20 18:24:31 UTC (rev 38746)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
2010-09-20 19:03:03 UTC (rev 38747)
@@ -27,12 +27,12 @@
#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...)
Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
2010-09-20 18:24:31 UTC (rev 38746)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
2010-09-20 19:03:03 UTC (rev 38747)
@@ -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",
Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/Jamfile 2010-09-20
18:24:31 UTC (rev 38746)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/Jamfile 2010-09-20
19:03:03 UTC (rev 38747)
@@ -59,9 +59,11 @@
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 {
Other related posts:
