changeset 5601:fd85802f755b

comp.fixes
author arpi
date Sat, 13 Apr 2002 17:44:14 +0000
parents e9c611e71605
children 628c85c15c7b
files Makefile configure
diffstat 2 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Apr 13 17:34:20 2002 +0000
+++ b/Makefile	Sat Apr 13 17:44:14 2002 +0000
@@ -37,17 +37,13 @@
 # a BSD compatible 'install' program
 INSTALL = install
 
-SRCS_COMMON = cyuv.c xacodec.c cpudetect.c mp_msg.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c ducktm1.c roqav.c qtrpza.c vobsub.c
+SRCS_COMMON = cyuv.c xacodec.c cpudetect.c mp_msg.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c roqav.c qtrpza.c vobsub.c
 SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c me-opt-reg.c
 SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c mp-opt-reg.c
 
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 
-ifeq ($(PNG),yes)
-SRCS_COMMON += mpng.c
-endif
-
 ifeq ($(VO2),yes)
 VO_LIBS = -Llibvo2 -lvo2
 VO_INC = -Ilibvo2
--- a/configure	Sat Apr 13 17:34:20 2002 +0000
+++ b/configure	Sat Apr 13 17:44:14 2002 +0000
@@ -2918,11 +2918,11 @@
   _xvid=no
   _divx4linux=yes
   _opendivx=no
-  _ld_decore='-ldivxdecore opendivx/postprocess.o'
+  _ld_decore='-ldivxdecore'
   _def_decore='#define NEW_DECORE 1'
   _def_divx='#define USE_DIVX'
   _def_divx5='#undef DECORE_DIVX5'
-  _def_odivx_postprocess='#define HAVE_ODIVX_POSTPROCESS 1'
+  _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS'
   _codecmodules="divx4linux $_codecmodules"
   _nocodecmodules="xvid $_nocodecmodules"
   echores "DivX4linux (with libdivxdecore.so)"