# HG changeset patch
# User arpi
# Date 1004316500 0
# Node ID 96803377ad5356239fccc84ffbdd626497c11649
# Parent  1ccf7cdeaea0bfa294acdc5e3c61ad01ff13d7bc
vo_odivx disabled

diff -r 1ccf7cdeaea0 -r 96803377ad53 Makefile
--- a/Makefile	Sun Oct 28 23:57:11 2001 +0000
+++ b/Makefile	Mon Oct 29 00:48:20 2001 +0000
@@ -29,7 +29,7 @@
 PP_LIBS = -Lpostproc -lpostproc
 XA_LIBS = -Lxa -lxa
 
-PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec encore libvo libao2 drivers drivers/syncfb linux postproc xa
+PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec libvo libao2 drivers drivers/syncfb linux postproc xa
 
 ifeq ($(GUI),yes)
 PARTS += Gui
@@ -58,7 +58,7 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-COMMONLIBS = libmpdemux/libmpdemux.a libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a encore/libencore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
+COMMONLIBS = libmpdemux/libmpdemux.a libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
 
 loader/libloader.a:
 	$(MAKE) -C loader
@@ -90,8 +90,8 @@
 opendivx/libdecore.a:
 	$(MAKE) -C opendivx
 
-encore/libencore.a:
-	$(MAKE) -C encore
+# encore/libencore.a:
+# 	$(MAKE) -C encore
 
 Gui/libgui.a:
 	$(MAKE) -C Gui
@@ -113,7 +113,7 @@
 	@for a in $(PARTS); do $(MAKE) -C $$a all ; done
 
 $(PRG):	$(MPLAYER_DEP)
-	$(CC) -rdynamic $(CFLAGS) -o $(PRG) mplayer.o -Llibmpdemux -lmpdemux $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(LIB_LOADER) $(AV_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) -Lencore -lencore $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm
+	$(CC) -rdynamic $(CFLAGS) -o $(PRG) mplayer.o -Llibmpdemux -lmpdemux $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(LIB_LOADER) $(AV_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm
 
 $(PRG_FIBMAP): fibmap_mplayer.o
 	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o
diff -r 1ccf7cdeaea0 -r 96803377ad53 libvo/Makefile
--- a/libvo/Makefile	Sun Oct 28 23:57:11 2001 +0000
+++ b/libvo/Makefile	Mon Oct 29 00:48:20 2001 +0000
@@ -3,7 +3,7 @@
 
 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 -r 1ccf7cdeaea0 -r 96803377ad53 libvo/video_out.c
--- a/libvo/video_out.c	Sun Oct 28 23:57:11 2001 +0000
+++ b/libvo/video_out.c	Mon Oct 29 00:48:20 2001 +0000
@@ -60,7 +60,7 @@
 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 @@
 	&video_out_png,
 #endif	
         &video_out_null,
-        &video_out_odivx,
+//        &video_out_odivx,
         &video_out_pgm,
         &video_out_md5,
 	&video_out_mpegpes,