From 65f186f4d08b5543a809261c0e970c00e860b22f Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 22 Jan 2006 18:11:35 +0000
Subject: proper support for shared libpostproc patch by Nico Sabbi, fixes and
 consistency cleanups by me

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17464 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpcodecs/Makefile    | 5 ++++-
 libmpcodecs/vd_ffmpeg.c | 2 +-
 libmpcodecs/vf.c        | 4 ++--
 libmpcodecs/vf_pp.c     | 7 ++++---
 4 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'libmpcodecs')

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index bc89a7c8cb..494d27bd34 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -139,7 +139,10 @@ VFILTER_SRCS=vf.c \
              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
 
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 76615ee4af..faf7b6a33f 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -74,7 +74,7 @@ typedef struct {
     int b_count;
 } vd_ffmpeg_ctx;
 
-//#ifdef FF_POSTPROCESS
+//#ifdef USE_LIBPOSTPROC
 //unsigned int lavc_pp=0;
 //#endif
 
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 52a5227b84..6b997cb114 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -30,7 +30,7 @@ extern vf_info_t vf_info_bmovl;
 #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 @@ static vf_info_t* filter_list[]={
 #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,
diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c
index f2fee138f0..5b623c8102 100644
--- a/libmpcodecs/vf_pp.c
+++ b/libmpcodecs/vf_pp.c
@@ -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 @@ vf_info_t vf_info_pp = {
 
 //===========================================================================//
 
-#endif // USE_LIBAVCODEC
-- 
cgit v1.2.3