[MPlayer-cvslog] r33260 - in trunk: Makefile libmpcodecs/vf.c libmpcodecs/vf_geq.c

[diego]

Author: diego
Date: Fri Apr 15 09:48:41 2011
New Revision: 33260

Log:
Build the geq video filter with shared FFmpeg.

geq works fine with shared FFmpeg, so do not require static builds for it.
patch by Alexis Ballier, alexis.ballier gmail com

Modified:
   trunk/Makefile
   trunk/libmpcodecs/vf.c
   trunk/libmpcodecs/vf_geq.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Thu Apr 14 22:41:50 2011	(r33259)
+++ trunk/Makefile	Fri Apr 15 09:48:41 2011	(r33260)
@@ -63,6 +63,7 @@ SRCS_COMMON-$(FFMPEG)                += 
                                         libaf/af_lavcresample.c     \
                                         libmpcodecs/ad_ffmpeg.c     \
                                         libmpcodecs/vd_ffmpeg.c     \
+                                        libmpcodecs/vf_geq.c        \
                                         libmpcodecs/vf_lavc.c       \
                                         libmpcodecs/vf_lavcdeint.c  \
                                         libmpcodecs/vf_pp.c         \
@@ -74,7 +75,6 @@ SRCS_COMMON-$(FFMPEG)                += 
 # These filters use private headers and do not work with shared FFmpeg.
 SRCS_COMMON-$(FFMPEG_A)              += libaf/af_lavcac3enc.c    \
                                         libmpcodecs/vf_fspp.c    \
-                                        libmpcodecs/vf_geq.c     \
                                         libmpcodecs/vf_mcdeint.c \
                                         libmpcodecs/vf_qp.c      \
                                         libmpcodecs/vf_spp.c     \

Modified: trunk/libmpcodecs/vf.c
==============================================================================
--- trunk/libmpcodecs/vf.c	Thu Apr 14 22:41:50 2011	(r33259)
+++ trunk/libmpcodecs/vf.c	Fri Apr 15 09:48:41 2011	(r33260)
@@ -143,6 +143,7 @@ static const vf_info_t* const filter_lis
     &vf_info_lavc,
     &vf_info_lavcdeint,
     &vf_info_screenshot,
+    &vf_info_geq,
 #endif
 #ifdef CONFIG_ZR
     &vf_info_zrmjpeg,
@@ -193,7 +194,6 @@ static const vf_info_t* const filter_lis
     &vf_info_fspp,
     &vf_info_qp,
     &vf_info_mcdeint,
-    &vf_info_geq,
 #endif
     &vf_info_yuvcsp,
     &vf_info_kerndeint,

Modified: trunk/libmpcodecs/vf_geq.c
==============================================================================
--- trunk/libmpcodecs/vf_geq.c	Thu Apr 14 22:41:50 2011	(r33259)
+++ trunk/libmpcodecs/vf_geq.c	Fri Apr 15 09:48:41 2011	(r33260)
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include "mp_msg.h"
-#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"