Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv2106/libvo Modified Files: Makefile sub.c video_out.c Log Message: Add DVD subtitles to menoder Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libvo/Makefile,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Makefile 7 Jan 2002 09:28:22 -0000 1.25 +++ Makefile 11 Jan 2002 16:06:45 -0000 1.26 @@ -3,7 +3,7 @@ LIBNAME = libvo.a -SRCS=aspect.c aclib.c osd.c font_load.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c $(OPTIONAL_SRCS) img_format.c vosub_vidix.c +SRCS=aspect.c aclib.c osd.c font_load.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c $(OPTIONAL_SRCS) img_format.c vosub_vidix.c sub.c OBJS=$(SRCS:.c=.o) CFLAGS = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DVB_INC) -DMPG12PLAY -DVIDIX_PATH='"$(prefix)/lib/mplayer/vidix/"' #-Wall Index: sub.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sub.c 11 Jan 2002 12:14:29 -0000 1.40 +++ sub.c 11 Jan 2002 16:06:45 -0000 1.41 @@ -1,6 +1,9 @@ +#include "config.h" +#include "video_out.h" #include "sub.h" +#include <stdlib.h> char * __sub_osd_names[]={ "Seekbar", Index: video_out.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- video_out.c 3 Dec 2001 01:09:36 -0000 1.30 +++ video_out.c 11 Jan 2002 16:06:45 -0000 1.31 @@ -144,5 +144,3 @@ #endif NULL }; - -#include "sub.c"