From cce6e4c9389fac893ca645d4b0bc21fa79b8417e Mon Sep 17 00:00:00 2001
From: shatty <shatty@nowhere.fake>
Date: Mon, 2 Feb 2004 07:13:30 +0000
Subject: [PATCH] build patches

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6467 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/media/plugins/avcodec/Jamfile             | 6 +++---
 src/add-ons/media/plugins/avcodec/avcodec.h           | 2 +-
 src/add-ons/media/plugins/avcodec/libavcodec/Jamfile  | 2 +-
 src/add-ons/media/plugins/avcodec/libavcodec/common.h | 8 ++++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/add-ons/media/plugins/avcodec/Jamfile b/src/add-ons/media/plugins/avcodec/Jamfile
index 6b7f132818..2206528a31 100644
--- a/src/add-ons/media/plugins/avcodec/Jamfile
+++ b/src/add-ons/media/plugins/avcodec/Jamfile
@@ -3,9 +3,9 @@ SubDir OBOS_TOP src add-ons media plugins avcodec ;
 UsePrivateHeaders media ;
 
 Addon avcodec : media plugins :
-	avcodec.cpp
-	codectbl.cpp
-	video_util.cpp
+# 	avcodec.cpp
+# 	codectbl.cpp
+# 	video_util.cpp
 	: 
 	false
 	:  
diff --git a/src/add-ons/media/plugins/avcodec/avcodec.h b/src/add-ons/media/plugins/avcodec/avcodec.h
index 78e5cc219c..13853396ee 100644
--- a/src/add-ons/media/plugins/avcodec/avcodec.h
+++ b/src/add-ons/media/plugins/avcodec/avcodec.h
@@ -25,7 +25,7 @@
 
 //#define DO_PROFILING
 
-#include "video_util.h"
+//#include "video_util.h"
 
 struct codec_table { CodecID id; media_type type; media_format_family family; uint32 fourcc; const char *prettyname;};
 
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile b/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
index 111992c220..aa54c078fe 100644
--- a/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
+++ b/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
@@ -1,7 +1,7 @@
 SubDir OBOS_TOP src add-ons media plugins avcodec libavcodec ;
 
 SubDirCcFlags -fomit-frame-pointer -DPIC ;
-DEFINES += HAVE_AV_CONFIG_H=1 ;
+SubDirCcFlags -DHAVE_AV_CONFIG_H=1 ;
 
 StaticLibrary avcodec :
 	4xm.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/common.h b/src/add-ons/media/plugins/avcodec/libavcodec/common.h
index c144ba17d4..fe2b2109e0 100644
--- a/src/add-ons/media/plugins/avcodec/libavcodec/common.h
+++ b/src/add-ons/media/plugins/avcodec/libavcodec/common.h
@@ -211,9 +211,13 @@ inline void dprintf(const char* fmt,...) {}
 #    else
 
 #        ifdef DEBUG
-#            define dprintf(fmt,...) printf(fmt, __VA_ARGS__)
+#            if defined(__BEOS__)
+#                define dprintf(fmt,args...) printf(fmt, ## args)
+#            else
+#                define dprintf(fmt,...) printf(fmt, __VA_ARGS__)
+#            endif
 #        else
-#            if defined(CONFIG_BEOS)
+#            if defined(__BEOS__)
 #                define dprintf(fmt...)
 #            else
 #                define dprintf(fmt,...)