From 6d15d130871499bdec85daaa69ee0c23f3cc91bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Fri, 7 Aug 2009 14:54:17 +0000
Subject: [PATCH] * Disabled GPL H.264 ASM code * Enabled WAV muxer. * Updated
 configure line in config.h to be closer to what it could have been   to
 produce the current config.h, but a lot of encoders and muxers are enabled  
 manually at the moment, so this line wouldn't produce the config.h as is.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32188 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp     | 13 +++++++++++++
 src/add-ons/media/plugins/ffmpeg/config.h           |  4 ++--
 .../media/plugins/ffmpeg/libavcodec/x86/Jamfile     |  4 ++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp b/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
index 827e5ca3c5..882704f83e 100644
--- a/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
+++ b/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
@@ -55,6 +55,19 @@ const media_file_format gMuxerTable[] = {
 //		"ogg",
 //		{ 0 }
 //	},
+	{
+		media_file_format::B_WRITABLE
+			| media_file_format::B_KNOWS_ENCODED_AUDIO,
+		{ 0 },
+		B_WAV_FORMAT_FAMILY,
+		100,
+		{ 0 },
+		"audio/x-wav",
+		"WAV Format",
+		"wav",
+		"wav",
+		{ 0 }
+	},
 };
 
 const size_t gMuxerCount = sizeof(gMuxerTable) / sizeof(media_file_format);
diff --git a/src/add-ons/media/plugins/ffmpeg/config.h b/src/add-ons/media/plugins/ffmpeg/config.h
index 223d512fa4..589340f62f 100644
--- a/src/add-ons/media/plugins/ffmpeg/config.h
+++ b/src/add-ons/media/plugins/ffmpeg/config.h
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--prefix=/boot/common/ --enable-shared --enable-gpl --disable-debug --disable-mmx --disable-demuxer=audio-beos --disable-muxer=audio-beos --disable-encoders --disable-parsers --disable-demuxers --disable-muxers"
+#define FFMPEG_CONFIGURATION "--prefix=/boot/common/ --enable-shared --disable-debug --disable-mmx --disable-demuxer=audio-beos --disable-muxer=audio-beos"
 #define FFMPEG_DATADIR "/boot/common//share/ffmpeg"
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
@@ -717,7 +717,7 @@
 #define CONFIG_TGP_MUXER 0
 #define CONFIG_VC1T_MUXER 0
 #define CONFIG_VOC_MUXER 0
-#define CONFIG_WAV_MUXER 0
+#define CONFIG_WAV_MUXER 1
 #define CONFIG_YUV4MPEGPIPE_MUXER 0
 #define CONFIG_LIBNUT_MUXER 0
 #define CONFIG_CROP_FILTER 1
diff --git a/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
index ff7549e711..272334b9d7 100644
--- a/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
@@ -44,8 +44,8 @@ if $(HAIKU_FFMPEG_USE_SSSE3) = 1 {
 		idct_sse2_xvid.c
 		vp3dsp_sse2.c
 		vp6dsp_sse2.c
-		h264_idct_sse2.nasm
-		h264_deblock_sse2.nasm
+#		h264_idct_sse2.nasm # GPL
+#		h264_deblock_sse2.nasm # GPL
 	;
 }