[MPlayer-cvslog] r23111 - in trunk: Makefile configure libmpcodecs/Makefile
diego
subversion at mplayerhq.hu
Wed Apr 25 10:38:05 CEST 2007
Author: diego
Date: Wed Apr 25 10:38:04 2007
New Revision: 23111
Log:
cosmetics: Rename Makefile variable CONFIG_ASS --> ASS.
Modified:
trunk/Makefile
trunk/configure
trunk/libmpcodecs/Makefile
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Apr 25 10:38:04 2007
@@ -72,7 +72,7 @@ COMMON_LIBS-$(FAAD_INTERNAL) += lib
COMMON_LIBS-$(TREMOR_INTERNAL) += tremor/libvorbisidec.a
COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/libdvdread.a
COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a
-COMMON_LIBS-$(CONFIG_ASS) += libass/libass.a
+COMMON_LIBS-$(ASS) += libass/libass.a
LIBS_MPLAYER = libvo/libvo.a \
libao2/libao2.a \
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Apr 25 10:38:04 2007
@@ -7771,7 +7771,7 @@ CDDA = $_cdda
CDDB = $_cddb
BITMAP_FONT = $_bitmap_font
FREETYPE = $_freetype
-CONFIG_ASS = $_ass
+ASS = $_ass
LIBMAD = $_mad
LIBVORBIS = $_vorbis
LIBTHEORA = $_theora
Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile (original)
+++ trunk/libmpcodecs/Makefile Wed Apr 25 10:38:04 2007
@@ -93,7 +93,6 @@ SRCS_COMMON = native/nuppelvideo.c \
vf_yuy2.c \
vf_yvu9.c \
-SRCS_COMMON-$(CONFIG_ASS) += vf_ass.c
# These filters use private headers and do not work with shared libavcodec.
SRCS_COMMON-$(LIBAVCODEC) += vf_fspp.c \
vf_geq.c \
@@ -102,6 +101,7 @@ SRCS_COMMON-$(LIBAVCODEC) +=
vf_spp.c \
vf_uspp.c \
+SRCS_COMMON-$(ASS) += vf_ass.c
SRCS_COMMON-$(FAAD) += ad_faad.c
SRCS_COMMON-$(HAVE_POSIX_SELECT) += vf_bmovl.c
SRCS_COMMON-$(JPEG) += vd_ijpg.c
More information about the MPlayer-cvslog
mailing list