From 0ea1b308d0ba96b272cfe18ba61b9dd599a16a7f Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 12 Jan 2002 23:30:20 +0000 Subject: [PATCH] added vo_xvidix git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4125 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/Makefile | 2 +- libvo/video_out.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libvo/Makefile b/libvo/Makefile index 194cd3cb46..2aec540037 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -7,7 +7,7 @@ SRCS=aspect.c aclib.c osd.c font_load.c video_out.c vo_null.c vo_pgm.c vo_md5.c OBJS=$(SRCS:.c=.o) ifeq ($(VIDIX),yes) -SRCS += vosub_vidix.c +SRCS += vosub_vidix.c vo_xvidix.c endif CFLAGS = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DVB_INC) -DMPG12PLAY #-Wall diff --git a/libvo/video_out.c b/libvo/video_out.c index 6bbd353e0b..a9f14d1965 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -78,6 +78,10 @@ extern vo_functions_t video_out_dxr3; extern vo_functions_t video_out_vesa; #endif extern vo_functions_t video_out_directfb; +#ifdef CONFIG_VIDIX +extern vo_functions_t video_out_xvidix; +#endif + vo_functions_t* video_out_drivers[] = { #ifdef HAVE_XMGA @@ -142,5 +146,8 @@ vo_functions_t* video_out_drivers[] = #ifdef HAVE_DIRECTFB &video_out_directfb, #endif +#ifdef CONFIG_VIDIX + &video_out_xvidix, +#endif NULL };