# HG changeset patch
# User michaelni
# Date 1045258045 0
# Node ID 8528d0b9e5085e20399a138236dd5ad76bd36de7
# Parent  a5be963709d1261373752d4e6c315c8531184308
moving postprocess to ffmpeg/libavcodec

diff -r a5be963709d1 -r 8528d0b9e508 Makefile
--- a/Makefile	Fri Feb 14 01:47:10 2003 +0000
+++ b/Makefile	Fri Feb 14 21:27:25 2003 +0000
@@ -35,6 +35,15 @@
 endif
 endif
 
+ifeq ($(CONFIG_PP),yes)
+ifeq ($(SHARED_PP),yes)
+EXTRALIBS += -lpostproc
+else
+# LIBS += libpostproc/libpostproc.a ... should be fixed
+OBJS += libpostproc/postprocess.o
+endif
+endif
+
 ifeq ($(CONFIG_MP3LAME),yes)
 OBJS += mp3lameaudio.o
 EXTRALIBS += -lmp3lame
@@ -125,6 +134,9 @@
 
 dsputil.o: dsputil.c dsputil.h
 
+libpostproc/libpostproc.a:
+	$(MAKE) -C libpostproc
+
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $< 
 
diff -r a5be963709d1 -r 8528d0b9e508 libpostproc/Makefile
--- a/libpostproc/Makefile	Fri Feb 14 01:47:10 2003 +0000
+++ b/libpostproc/Makefile	Fri Feb 14 21:27:25 2003 +0000
@@ -1,18 +1,14 @@
 
-include ../config.mak
+include ../../config.mak
 
-SWSLIB = libswscale.a
 ifeq ($(SHARED_PP),yes)
 SPPLIB = libpostproc.so
 SPPVERSION = 0.0.1
 endif
 PPLIB = libpostproc.a
 
-SWSSRCS=swscale.c rgb2rgb.c yuv2rgb.c
-SWSOBJS=$(SWSSRCS:.c=.o)
 PPOBJS=postprocess.o
 SPPOBJS=postprocess_pic.o
-CS_TEST_OBJS=cs_test.o rgb2rgb.o ../cpudetect.o ../mp_msg.o ../libvo/aclib.o
 
 CFLAGS  = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
 # -I/usr/X11R6/include/
@@ -22,13 +18,10 @@
 # .PHONY: all clean
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I.. -o $@ $<
+	$(CC) -c $(CFLAGS) -I.. -I../.. -o $@ $<
 
 all:    $(SWSLIB) $(PPLIB) $(SPPLIB)
 
-$(SWSLIB):     $(SWSOBJS)
-	$(AR) r $(SWSLIB) $(SWSOBJS)
-
 clean:
 	rm -f *.o *.a *~ *.so
 
@@ -38,14 +31,11 @@
 dep:    depend
 
 depend:
-	$(CC) -MM $(CFLAGS) $(SWSSRCS) postprocess.c 1>.depend
-
-cs_test: $(CS_TEST_OBJS)
-	$(CC) $(CS_TEST_OBJS) -o cs_test
+	$(CC) -MM $(CFLAGS) postprocess.c 1>.depend
 
 ifeq ($(SHARED_PP),yes)
 postprocess_pic.o: postprocess.c
-	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -o $@ $<
+	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
 
 $(SPPLIB): $(SPPOBJS)
 	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
diff -r a5be963709d1 -r 8528d0b9e508 libpostproc/mangle.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpostproc/mangle.h	Fri Feb 14 21:27:25 2003 +0000
@@ -0,0 +1,19 @@
+/* mangle.h - This file has some CPP macros to deal with different symbol
+ * mangling across binary formats.
+ * (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
+ * File licensed under the GPL, see http://www.fsf.org/ for more info.
+ */
+
+#ifndef __MANGLE_H
+#define __MANGLE_H
+
+/* Feel free to add more to the list, eg. a.out IMO */
+#if defined(__CYGWIN__) || defined(__OS2__) || \
+   (defined(__OpenBSD__) && !defined(__ELF__))
+#define MANGLE(a) "_" #a
+#else
+#define MANGLE(a) #a
+#endif
+
+#endif /* !__MANGLE_H */
+
diff -r a5be963709d1 -r 8528d0b9e508 libpostproc/postprocess.c
--- a/libpostproc/postprocess.c	Fri Feb 14 01:47:10 2003 +0000
+++ b/libpostproc/postprocess.c	Fri Feb 14 21:27:25 2003 +0000
@@ -75,12 +75,13 @@
 //#undef HAVE_MMX
 //#undef ARCH_X86
 //#define DEBUG_BRIGHTNESS
-#ifndef PIC
-#include "../libvo/fastmemcpy.h"
+#ifdef USE_FASTMEMCPY
+#include "libvo/fastmemcpy.h"
 #endif
 #include "postprocess.h"
 #include "postprocess_internal.h"
-#include "mangle.h"
+
+#include "mangle.h" //FIXME should be supressed
 
 #define MIN(a,b) ((a) > (b) ? (b) : (a))
 #define MAX(a,b) ((a) < (b) ? (b) : (a))