comp.fixes

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5602 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 3 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index c82681b744..f1acb109e6 100644
--- a/Makefile
+++ b/Makefile
@@ -37,17 +37,13 @@ MANDIR = ${prefix}/man
 # 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
diff --git a/configure b/configure
index 101039dfca..7276c25d49 100755
--- a/configure
+++ b/configure
@@ -2918,11 +2918,11 @@ elif test "$_divx4linux" != no && cc_check -lm -ldivxdecore -lm ; then
   _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)"