Mercurial > mplayer.hg

changeset 33173:b86ea534cfc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author diego
date Fri, 15 Apr 2011 07:48:41 +0000
parents 06dc4b66a0f1
children 29c59e557575
files Makefile libmpcodecs/vf.c libmpcodecs/vf_geq.c
diffstat 3 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Apr 14 20:41:50 2011 +0000
+++ b/Makefile	Fri Apr 15 07:48:41 2011 +0000
@@ -63,6 +63,7 @@
                                         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 @@
 # 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     \
--- a/libmpcodecs/vf.c	Thu Apr 14 20:41:50 2011 +0000
+++ b/libmpcodecs/vf.c	Fri Apr 15 07:48:41 2011 +0000
@@ -143,6 +143,7 @@
     &vf_info_lavc,
     &vf_info_lavcdeint,
     &vf_info_screenshot,
+    &vf_info_geq,
 #endif
 #ifdef CONFIG_ZR
     &vf_info_zrmjpeg,
@@ -193,7 +194,6 @@
     &vf_info_fspp,
     &vf_info_qp,
     &vf_info_mcdeint,
-    &vf_info_geq,
 #endif
     &vf_info_yuvcsp,
     &vf_info_kerndeint,
--- a/libmpcodecs/vf_geq.c	Thu Apr 14 20:41:50 2011 +0000
+++ b/libmpcodecs/vf_geq.c	Fri Apr 15 07:48:41 2011 +0000
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include "mp_msg.h"
-#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"