From 62112dedb0a6c874289734b2a64d9ce93b8ae4f0 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@glyph.nonexistent.invalid>
Date: Sat, 30 Oct 2010 07:55:31 +0300
Subject: enable vo_mga, vo_xmga, vf_palette, vf_halfpack

Nothing should depend on libswscale internals any more, so re-enable
everything. vf_palette and vf_halfpack were actually fixed earlier but
were not properly enabled.
---
 Makefile         |  9 ++-------
 configure        | 22 ++++------------------
 libmpcodecs/vf.c |  4 ----
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index 428672e7ee..4e40e77332 100644
--- a/Makefile
+++ b/Makefile
@@ -169,7 +169,6 @@ SRCS_COMMON-$(LIBNEMESI)             += libmpdemux/demux_nemesi.c \
 SRCS_COMMON-$(LIBNUT)                += libmpdemux/demux_nut.c
 SRCS_COMMON-$(LIBPOSTPROC)           += libmpcodecs/vf_pp.c
 SRCS_COMMON-$(LIBSMBCLIENT)          += stream/stream_smb.c
-SRCS_COMMON-$(LIBSWSCALE_INTERNALS)  += libmpcodecs/vf_palette.c \
 
 SRCS_COMMON-$(LIBTHEORA)             += libmpcodecs/vd_theora.c
 SRCS_COMMON-$(LIVE555)               += libmpdemux/demux_rtp.cpp \
@@ -432,6 +431,7 @@ SRCS_COMMON = asxparser.c \
               libmpcodecs/vf_noformat.c \
               libmpcodecs/vf_noise.c \
               libmpcodecs/vf_ow.c \
+              libmpcodecs/vf_palette.c \
               libmpcodecs/vf_perspective.c \
               libmpcodecs/vf_phase.c \
               libmpcodecs/vf_pp7.c \
@@ -799,16 +799,11 @@ codec-cfg.d codec-cfg.o: codecs.conf.h
 $(call ADDSUFFIXES,.d .o,mpcommon osdep/mplayer.rc): version.h
 
 # Files that depend on libswscale internals
-libvo/vo_mga.o libvo/vo_xmga.o libmpcodecs/vf_palette.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS)
+libmpcodecs/vf_palette.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS)
 
 # Files that depend on libavcodec internals
 libmpcodecs/vf_fspp.o libmpcodecs/vf_geq.o libmpcodecs/vf_mcdeint.o libmpcodecs/vf_qp.o libmpcodecs/vf_spp.o libvo/jpeg_enc.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS)
 
-# yuv4mpeg has rgb conversion code under #ifdef CONFIG_LIBSWSCALE_INTERNALS
-ifeq ($(LIBSWSCALE_INTERNALS),yes)
-libvo/vo_yuv4mpeg.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS)
-endif
-
 osdep/mplayer-rc.o: osdep/mplayer.exe.manifest
 
 libdvdcss/%:   CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
diff --git a/configure b/configure
index 71e418f3a9..5d729bdc30 100755
--- a/configure
+++ b/configure
@@ -7087,15 +7087,8 @@ if test "$_mga" = auto ; then
   test -c /dev/mga_vid && _mga=yes
 fi
 if test "$_mga" = yes ; then
-  if test "$_libswscale_internals" = yes ; then
-    def_mga='#define CONFIG_MGA 1'
-    vomodules="mga $vomodules"
-  else
-    res_comment="libswscale internal headers are required by mga, sorry"
-    _mga=no
-    def_mga='#undef CONFIG_MGA'
-    novomodules="mga $novomodules"
-  fi
+  def_mga='#define CONFIG_MGA 1'
+  vomodules="mga $vomodules"
 else
   def_mga='#undef CONFIG_MGA'
   novomodules="mga $novomodules"
@@ -7109,15 +7102,8 @@ if test "$_xmga" = auto ; then
   test "$_x11" = yes && test "$_mga" = yes && _xmga=yes
 fi
 if test "$_xmga" = yes ; then
-  if test "$_libswscale_internals" = yes ; then
-    def_xmga='#define CONFIG_XMGA 1'
-    vomodules="xmga $vomodules"
-  else
-    res_comment="libswscale internal headers are required by xmga, sorry"
-    _xmga=no
-    def_xmga='#undef CONFIG_XMGA'
-    novomodules="xmga $novomodules"
-  fi
+  def_xmga='#define CONFIG_XMGA 1'
+  vomodules="xmga $vomodules"
 else
   def_xmga='#undef CONFIG_XMGA'
   novomodules="xmga $novomodules"
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 7db177f353..71ead4ae2d 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -137,9 +137,7 @@ static const vf_info_t* const filter_list[]={
     &vf_info_flip,
     &vf_info_rotate,
     &vf_info_mirror,
-#ifdef CONFIG_LIBSWSCALE_INTERNALS
     &vf_info_palette,
-#endif
     &vf_info_pp7,
 #ifdef CONFIG_LIBAVCODEC
     &vf_info_lavc,
@@ -158,9 +156,7 @@ static const vf_info_t* const filter_list[]={
     &vf_info_eq,
     &vf_info_eq2,
     &vf_info_gradfun,
-#ifdef CONFIG_LIBSWSCALE_INTERNALS
     &vf_info_halfpack,
-#endif
     &vf_info_dint,
     &vf_info_1bpp,
     &vf_info_2xsai,
-- 
cgit v1.2.3