[MPlayer-cvslog] CVS: main/libmpcodecs Makefile, 1.156, 1.157 vf.c, 1.121, 1.122 vf_pp.c, 1.34, 1.35 vd_ffmpeg.c, 1.156, 1.157

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv22257/libmpcodecs

Modified Files:
	Makefile vf.c vf_pp.c vd_ffmpeg.c 
Log Message:
proper support for shared libpostproc
patch by Nico Sabbi, fixes and consistency cleanups by me


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- Makefile	15 Jan 2006 10:25:14 -0000	1.156
+++ Makefile	22 Jan 2006 18:11:35 -0000	1.157
@@ -139,7 +139,10 @@
              vf_yvu9.c \
              vf_screenshot.c \
 
-ifeq ($(HAVE_FFPOSTPROCESS),yes)
+ifeq ($(CONFIG_LIBPOSTPROC),yes)
+VFILTER_SRCS += vf_pp.c
+endif
+ifeq ($(CONFIG_LIBPOSTPROC_SO),yes)
 VFILTER_SRCS += vf_pp.c
 endif
 

Index: vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- vf.c	12 Jan 2006 20:04:34 -0000	1.121
+++ vf.c	22 Jan 2006 18:11:35 -0000	1.122
@@ -30,7 +30,7 @@
 #endif
 extern vf_info_t vf_info_crop;
 extern vf_info_t vf_info_expand;
-#ifdef FF_POSTPROCESS
+#if defined(USE_LIBPOSTPROC) || defined(USE_LIBPOSTPROC_SO)
 extern vf_info_t vf_info_pp;
 #endif
 extern vf_info_t vf_info_scale;
@@ -109,7 +109,7 @@
 #endif
     &vf_info_crop,
     &vf_info_expand,
-#ifdef FF_POSTPROCESS
+#if defined(USE_LIBPOSTPROC) || defined(USE_LIBPOSTPROC_SO)
     &vf_info_pp,
 #endif
     &vf_info_scale,

Index: vf_pp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pp.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- vf_pp.c	18 Nov 2005 14:39:24 -0000	1.34
+++ vf_pp.c	22 Jan 2006 18:11:35 -0000	1.35
@@ -16,15 +16,17 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#ifdef USE_LIBAVCODEC
 
+#ifdef USE_LIBPOSTPROC_SO
+#include <postproc/postprocess.h>
+#elif defined(USE_LIBPOSTPROC)
 #define EMU_OLD
-
 #include "libavcodec/libpostproc/postprocess.h"
 
 #ifdef EMU_OLD
 #include "libavcodec/libpostproc/postprocess_internal.h"
 #endif
+#endif
 
 struct vf_priv_s {
     int pp;
@@ -226,4 +228,3 @@
 
 //===========================================================================//
 
-#endif // USE_LIBAVCODEC

Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- vd_ffmpeg.c	19 Dec 2005 19:38:28 -0000	1.156
+++ vd_ffmpeg.c	22 Jan 2006 18:11:35 -0000	1.157
@@ -74,7 +74,7 @@
     int b_count;
 } vd_ffmpeg_ctx;
 
-//#ifdef FF_POSTPROCESS
+//#ifdef USE_LIBPOSTPROC
 //unsigned int lavc_pp=0;
 //#endif