github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-16 22:37:28 +01:00
Code Releases Activity

vo_odivx disabled

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2529 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2001-10-29 00:48:20 +00:00
parent 050a03f6d0
commit 3e59e2495c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -29,7 +29,7 @@ OSDEP_LIBS = -Llinux -losdep
PP_LIBS = -Lpostproc -lpostproc PP_LIBS = -Lpostproc -lpostproc
XA_LIBS = -Lxa -lxa 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) ifeq ($(GUI),yes)
PARTS += Gui PARTS += Gui
@ -58,7 +58,7 @@ all: $(ALL_PRG)
.c.o: .c.o:
$(CC) -c $(CFLAGS) -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: loader/libloader.a:
$(MAKE) -C loader $(MAKE) -C loader
@ -90,8 +90,8 @@ mp3lib/libMP3.a:
opendivx/libdecore.a: opendivx/libdecore.a:
$(MAKE) -C opendivx $(MAKE) -C opendivx
encore/libencore.a: # encore/libencore.a:
$(MAKE) -C encore # $(MAKE) -C encore
Gui/libgui.a: Gui/libgui.a:
$(MAKE) -C Gui $(MAKE) -C Gui
@ -113,7 +113,7 @@ mplayerwithoutlink: $(MPLAYER_DEP)
@for a in $(PARTS); do $(MAKE) -C $$a all ; done @for a in $(PARTS); do $(MAKE) -C $$a all ; done
$(PRG): $(MPLAYER_DEP) $(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 $(PRG_FIBMAP): fibmap_mplayer.o
$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o $(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o

2
libvo/Makefile
View File

@ -3,7 +3,7 @@ include config.mak
LIBNAME = libvo.a 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) OBJS=$(SRCS:.c=.o)
ifeq ($(TARGET_ARCH_X86),yes) ifeq ($(TARGET_ARCH_X86),yes)

4
libvo/video_out.c
View File

@ -60,7 +60,7 @@ extern vo_functions_t video_out_sdl;
extern vo_functions_t video_out_3dfx; extern vo_functions_t video_out_3dfx;
extern vo_functions_t video_out_tdfxfb; extern vo_functions_t video_out_tdfxfb;
extern vo_functions_t video_out_null; 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_pgm;
extern vo_functions_t video_out_md5; extern vo_functions_t video_out_md5;
extern vo_functions_t video_out_syncfb; extern vo_functions_t video_out_syncfb;
@ -124,7 +124,7 @@ vo_functions_t* video_out_drivers[] =
&video_out_png, &video_out_png,
#endif #endif
&video_out_null, &video_out_null,
&video_out_odivx, // &video_out_odivx,
&video_out_pgm, &video_out_pgm,
&video_out_md5, &video_out_md5,
&video_out_mpegpes, &video_out_mpegpes,