Sophie

Sophie

distrib > Mageia > 7 > i586 > by-pkgid > c2623da3cbad6c72a39b8ab4afd99bd2 > files > 13

mplayer-1.4-1.mga7.src.rpm

From 12c4249c57829e2ccf1ef4f00c2bee6addd0763c Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi.hannula@iki.fi>
Date: Fri, 27 Jan 2012 15:10:22 +0200
Subject: [PATCH 2/2] hack: build filters that use internal headers even with
 shared FFmpeg

This depends on the internal headers being available during build - the
filters in question only use visible symbols from FFmpeg, however.
---
 Makefile         |    2 +-
 libmpcodecs/vf.c |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b5fedcb..003337e 100644
--- a/Makefile
+++ b/Makefile
@@ -67,9 +67,8 @@
 SRCS_COMMON-$(CONFIG_VF_LAVFI)      +=  libmpcodecs/vf_lavfi.c
 
 # These filters use private headers and do not work with shared FFmpeg.
-SRCS_COMMON-$(FFMPEG_A)              += libmpcodecs/vf_fspp.c           \
+SRCS_COMMON-$(FFMPEG)                += libmpcodecs/vf_fspp.c           \
                                         libmpcodecs/vf_qp.c             \
-                                        libmpcodecs/vf_spp.c            \
                                         libmpcodecs/vf_uspp.c           \
 
 SRCS_COMMON-$(FREETYPE)              += sub/font_load_ft.c
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index dd58aae..a694452 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -197,11 +197,11 @@
     &vf_info_hue,
 #ifdef CONFIG_FFMPEG_A
     &vf_info_spp,
+#endif
     &vf_info_uspp,
     &vf_info_fspp,
     &vf_info_qp,
 //    &vf_info_mcdeint, //TODO: vf_mcdeint is deactivated because it doesn't build after latest FFmpeg major bumps
-#endif
     &vf_info_yuvcsp,
     &vf_info_kerndeint,
     &vf_info_rgbtest,