aboutsummaryrefslogtreecommitdiffhomepage
path: root/libvo
diff options
context:
space:
mode:
authorGravatar ivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-09-20 01:31:26 +0000
committerGravatar ivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-09-20 01:31:26 +0000
commite5029c75b6e15bb81219c39d1669e596ac419785 (patch)
tree2c5dcfd2d7e15d85523dcfaa114d1a2d024068a9 /libvo
parent9128afc215e9a57483c3bc6d39c96922208866a3 (diff)
This patch enables the compilation and linking of vo_pnm (the portable
anymap video output driver) to libvo. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13398 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/Makefile2
-rw-r--r--libvo/video_out.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/libvo/Makefile b/libvo/Makefile
index 0ca9c78a6b..46409134a4 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_pgm.c vo_md5.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c
+SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c vo_pnm.c
OBJS=$(SRCS:.c=.o)
ifeq ($(VIDIX),yes)
diff --git a/libvo/video_out.c b/libvo/video_out.c
index c727d46ab1..ecb751e12e 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -124,6 +124,7 @@ extern vo_functions_t video_out_tga;
#ifdef MACOSX
extern vo_functions_t video_out_quartz;
#endif
+extern vo_functions_t video_out_pnm;
vo_functions_t* video_out_drivers[] =
{
@@ -240,6 +241,7 @@ vo_functions_t* video_out_drivers[] =
#ifdef HAVE_TGA
&video_out_tga,
#endif
+ &video_out_pnm,
NULL
};