diff options
| author | kmkaplan <kmkaplan@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-11 16:06:45 +0000 |
|---|---|---|
| committer | kmkaplan <kmkaplan@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-11 16:06:45 +0000 |
| commit | 940ceca1e7381e36404972c23c1004ac283cf576 (patch) | |
| tree | 60a543480d469c1ef18f33cf38ec15f9a4693d36 /libvo | |
| parent | 610d48a93009cebb364be3f8d9e266ef3cab56a7 (diff) | |
| download | mpv-940ceca1e7381e36404972c23c1004ac283cf576.tar.bz2 mpv-940ceca1e7381e36404972c23c1004ac283cf576.tar.xz | |
Add DVD subtitles to menoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4089 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/Makefile | 2 | ||||
| -rw-r--r-- | libvo/sub.c | 3 | ||||
| -rw-r--r-- | libvo/video_out.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libvo/Makefile b/libvo/Makefile index bfef5b4492..5c942ed8ec 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -3,7 +3,7 @@ include config.mak 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 diff --git a/libvo/sub.c b/libvo/sub.c index b0b8c95780..a5ba3b84a1 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -1,6 +1,9 @@ +#include "config.h" +#include "video_out.h" #include "sub.h" +#include <stdlib.h> char * __sub_osd_names[]={ "Seekbar", diff --git a/libvo/video_out.c b/libvo/video_out.c index 8edaef83dd..6bbd353e0b 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -144,5 +144,3 @@ vo_functions_t* video_out_drivers[] = #endif NULL }; - -#include "sub.c" |