From ae109a53230445270ecddb9cd158ed65dfbae8c8 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Wed, 17 Mar 2004 20:24:16 +0000
Subject: fix ffmpeg breakage

CVS patchset: 6283
CVS date: 2004/03/17 20:24:16
---
 src/libffmpeg/libavcodec/Makefile.am | 3 ++-
 src/libffmpeg/libavcodec/common.h    | 2 ++
 src/libffmpeg/libavcodec/utils.c     | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index 00dbe4f2a..8e5d53df3 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = armv4l i386 mlib alpha ppc libpostproc
 
 ## some files here are #included by others... go figure.
 EXTRA_DIST = fdctref.c motion_est_template.c svq3.c wmv2.c \
-	imgresample.c motion_est.c mdec.c
+	imgresample.c mdec.c
 
 AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
 ASFLAGS =
@@ -45,6 +45,7 @@ libavcodec_la_SOURCES = \
 	mace.c \
 	mem.c \
 	mjpeg.c \
+	motion_est.c \
 	mpeg12.c \
 	mpegaudiodec.c \
 	mpegvideo.c \
diff --git a/src/libffmpeg/libavcodec/common.h b/src/libffmpeg/libavcodec/common.h
index a5c67d3a7..59b128cef 100644
--- a/src/libffmpeg/libavcodec/common.h
+++ b/src/libffmpeg/libavcodec/common.h
@@ -1286,6 +1286,7 @@ tend= rdtsc();\
 #define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d)
 
 /* avoid usage of various functions */
+#if 0
 #define malloc please_use_av_malloc
 #define free please_use_av_free
 #define realloc please_use_av_realloc
@@ -1293,6 +1294,7 @@ tend= rdtsc();\
 #define printf please_use_av_log
 #define fprintf please_use_av_log
 #endif
+#endif
 
 #define CHECKED_ALLOCZ(p, size)\
 {\
diff --git a/src/libffmpeg/libavcodec/utils.c b/src/libffmpeg/libavcodec/utils.c
index b6b6059e9..145f9df65 100644
--- a/src/libffmpeg/libavcodec/utils.c
+++ b/src/libffmpeg/libavcodec/utils.c
@@ -855,11 +855,11 @@ static void av_log_default_callback(void* ptr, int level, const char* fmt, va_li
     AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
     if(level>av_log_level)
 	return;
-#undef fprintf
+/* #undef fprintf */
     if(print_prefix && avc) {
 	    fprintf(stderr, "[%s @ %p]", avc->item_name(ptr), avc);
     }
-#define fprintf please_use_av_log
+/* #define fprintf please_use_av_log */
         
     print_prefix= strstr(fmt, "\n") != NULL;
         
-- 
cgit v1.2.3