summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-10-23 22:43:19 +0000
committerivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-10-23 22:43:19 +0000
commit241d339efdebb923e9e5c86341eb8eba673b0274 (patch)
tree7f5d1b2112ac04bacbaa9f28ae30b93a2c235ac6 /libvo
parentf06a98dc9faa2842f6183771bac73dde4a19ff0d (diff)
downloadmpv-241d339efdebb923e9e5c86341eb8eba673b0274.tar.bz2
mpv-241d339efdebb923e9e5c86341eb8eba673b0274.tar.xz
Add --enable and --disable options for vo_pnm and vo_md5sum to configure.
It's now possible to compile libvo without pnm and/or md5sum support. Default is enable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13745 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/Makefile2
-rw-r--r--libvo/video_out.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/libvo/Makefile b/libvo/Makefile
index 643e6c7ce6..b5eb305c78 100644
--- a/libvo/Makefile
+++ b/libvo/Makefile
@@ -3,7 +3,7 @@ include config.mak
LIBNAME = libvo.a
-SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c vo_pnm.c vo_md5sum.c md5sum.c
+SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c
OBJS=$(SRCS:.c=.o)
ifeq ($(VIDIX),yes)
diff --git a/libvo/video_out.c b/libvo/video_out.c
index a7b7a589e2..d621a1599f 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -122,8 +122,12 @@ extern vo_functions_t video_out_tga;
#ifdef MACOSX
extern vo_functions_t video_out_quartz;
#endif
+#ifdef HAVE_PNM
extern vo_functions_t video_out_pnm;
+#endif
+#ifdef HAVE_MD5SUM
extern vo_functions_t video_out_md5sum;
+#endif
vo_functions_t* video_out_drivers[] =
{
@@ -237,8 +241,12 @@ vo_functions_t* video_out_drivers[] =
#ifdef HAVE_TGA
&video_out_tga,
#endif
+#ifdef HAVE_PNM
&video_out_pnm,
+#endif
+#ifdef HAVE_MD5SUM
&video_out_md5sum,
+#endif
NULL
};