diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-11-26 01:03:31 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-11-26 01:03:31 +0000 |
| commit | f7c890258f736dc45ae81e2097df6c9658e93606 (patch) | |
| tree | eed0d30d99ebbdc649d7fb20329ec2911357b877 /src/video_out/Makefile.am | |
| parent | 1daacd9d5b53cac2671d2bd9c93a3daa629254ea (diff) | |
| download | xine-lib-f7c890258f736dc45ae81e2097df6c9658e93606.tar.gz xine-lib-f7c890258f736dc45ae81e2097df6c9658e93606.tar.bz2 | |
* new unscaled overlay feature (using XShape extension)
text subtitles may now be rendered at full screen resolution
* load xine fonts on demand - faster startup
note: support added to xv, xshm and vidix
CVS patchset: 5780
CVS date: 2003/11/26 01:03:31
Diffstat (limited to 'src/video_out/Makefile.am')
| -rw-r--r-- | src/video_out/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 0f5936412..43489bf9c 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -17,6 +17,7 @@ libdir = $(XINE_PLUGINDIR) if HAVE_X11 xshm_module = xineplug_vo_out_xshm.la syncfb_module = xineplug_vo_out_syncfb.la +X11OSD = x11osd.c if HAVE_XV xv_module = xineplug_vo_out_xv.la endif @@ -66,7 +67,8 @@ lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) $(aa_module) $(pgx6 $(vidix_module) $(fb_module) $(sdl_module) $(syncfb_module) \ $(stk_module) $(directfb_module) xineplug_vo_out_none.la -xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c +xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c \ + $(X11OSD) xineplug_vo_out_xv_la_LIBADD = \ $(XV_LIB) \ $(X_LIBS) \ @@ -84,7 +86,7 @@ xineplug_vo_out_xvmc_la_LIBADD = \ xineplug_vo_out_xvmc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ - alphablend.c video_out_xshm.c + alphablend.c video_out_xshm.c $(X11OSD) xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) -lXext $(XINE_LIB) xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ @@ -115,7 +117,7 @@ xineplug_vo_out_sdl_la_SOURCES = alphablend.c video_out_sdl.c xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS) $(XINE_LIB) xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c +xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c $(X11OSD) xineplug_vo_out_vidix_la_LIBADD = $(X_LIBS) \ $(top_builddir)/src/video_out/vidix/libvidix.la \ $(top_builddir)/src/video_out/libdha/libdha.la @@ -133,4 +135,4 @@ xineplug_vo_out_stk_la_LIBADD = $(LIBSTK_LIBS) xineplug_vo_out_stk_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h \ - yuv2rgb.h video_out_win32.h + yuv2rgb.h video_out_win32.h x11osd.h |