summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-29 00:48:20 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-29 00:48:20 +0000
commit3e59e2495ce729cb82cceb169964d9ff2d7c0a17 (patch)
treeed204e3f548603b7ad9edbf49135bc7bca1dbe87 /libvo
parent050a03f6d029bd2a070731bf187c08b2d38482e8 (diff)
downloadmpv-3e59e2495ce729cb82cceb169964d9ff2d7c0a17.tar.bz2
mpv-3e59e2495ce729cb82cceb169964d9ff2d7c0a17.tar.xz
vo_odivx disabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2529 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/Makefile2
-rw-r--r--libvo/video_out.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/libvo/Makefile b/libvo/Makefile
index 192e200b00..544fd3caf5 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 yuv2rgb.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c vo_odivx.c x11_common.c $(OPTIONAL_SRCS)
+SRCS=aspect.c aclib.c osd.c font_load.c yuv2rgb.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c $(OPTIONAL_SRCS)
OBJS=$(SRCS:.c=.o)
ifeq ($(TARGET_ARCH_X86),yes)
diff --git a/libvo/video_out.c b/libvo/video_out.c
index a0bc432c10..d19faa77d0 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -60,7 +60,7 @@ extern vo_functions_t video_out_sdl;
extern vo_functions_t video_out_3dfx;
extern vo_functions_t video_out_tdfxfb;
extern vo_functions_t video_out_null;
-extern vo_functions_t video_out_odivx;
+//extern vo_functions_t video_out_odivx;
extern vo_functions_t video_out_pgm;
extern vo_functions_t video_out_md5;
extern vo_functions_t video_out_syncfb;
@@ -124,7 +124,7 @@ vo_functions_t* video_out_drivers[] =
&video_out_png,
#endif
&video_out_null,
- &video_out_odivx,
+// &video_out_odivx,
&video_out_pgm,
&video_out_md5,
&video_out_mpegpes,