diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-28 22:44:16 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-28 22:44:16 +0000 |
| commit | ec5ad59cdb4b6ea0041b71cd9992c4366406bfd3 (patch) | |
| tree | 0a244a6a3e632633c9b562a53ef2ac87db511240 /libvo | |
| parent | 473e2c136d3c7f53cdf0f475df609ea92ad6b7f7 (diff) | |
| download | mpv-ec5ad59cdb4b6ea0041b71cd9992c4366406bfd3.tar.bz2 mpv-ec5ad59cdb4b6ea0041b71cd9992c4366406bfd3.tar.xz | |
added support for external VIDIX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17989 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/Makefile | 4 | ||||
| -rw-r--r-- | libvo/vosub_vidix.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libvo/Makefile b/libvo/Makefile index ecb4203c99..6e7560e699 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -29,6 +29,10 @@ ifeq ($(VIDIX),yes) SRCS += vosub_vidix.c endif +ifeq ($(EXTERNAL_VIDIX),yes) +SRCS += vosub_vidix.c +endif + CFLAGS = $(OPTFLAGS) -I. -I.. -I../osdep \ $(LIBAV_INC) \ $(FREETYPE_INC) \ diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index 31dc21cd6c..f2764e4ed9 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -716,7 +716,7 @@ int vidix_preinit(const char *drvname,void *server) return -1; } #ifndef __MINGW32__ - vidix_handler = vdlOpen(MPLAYER_LIBDIR "/mplayer/vidix/", + vidix_handler = vdlOpen(MP_VIDIX_PFX, drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL, TYPE_OUTPUT, verbose); |