Merge svn changes up to r26540

Conflicts:

	Makefile

1 files changed, 375 insertions, 41 deletions

diff --git a/Makefile b/Makefile
index beec3ab8ad..b31b98d107 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,7 @@ SRCS_COMMON = asxparser.c \
               sub_cc.c \
               subopt-helper.c \
               subreader.c \
+              talloc.c \
               vobsub.c \
               libaf/af.c \
               libaf/af_center.c \
@@ -60,18 +61,186 @@ SRCS_COMMON = asxparser.c \
               libaf/format.c \
               libaf/reorder_ch.c \
               libaf/window.c \
+              libmpcodecs/ad.c \
+              libmpcodecs/ad_alaw.c \
+              libmpcodecs/ad_dk3adpcm.c \
+              libmpcodecs/ad_dvdpcm.c \
+              libmpcodecs/ad_hwac3.c \
+              libmpcodecs/ad_hwmpa.c \
+              libmpcodecs/ad_imaadpcm.c \
+              libmpcodecs/ad_msadpcm.c \
+              libmpcodecs/ad_msgsm.c \
+              libmpcodecs/ad_pcm.c \
+              libmpcodecs/dec_audio.c \
+              libmpcodecs/dec_video.c \
+              libmpcodecs/img_format.c \
+              libmpcodecs/mp_image.c \
+              libmpcodecs/native/nuppelvideo.c \
+              libmpcodecs/native/rtjpegn.c \
+              libmpcodecs/native/xa_gsm.c \
+              libmpcodecs/pullup.c \
+              libmpcodecs/vd.c \
+              libmpcodecs/vd_hmblck.c \
+              libmpcodecs/vd_lzo.c \
+              libmpcodecs/vd_mpegpes.c \
+              libmpcodecs/vd_mtga.c \
+              libmpcodecs/vd_null.c \
+              libmpcodecs/vd_nuv.c \
+              libmpcodecs/vd_raw.c \
+              libmpcodecs/vd_sgi.c \
+              libmpcodecs/vf.c \
+              libmpcodecs/vf_1bpp.c \
+              libmpcodecs/vf_2xsai.c \
+              libmpcodecs/vf_blackframe.c \
+              libmpcodecs/vf_boxblur.c \
+              libmpcodecs/vf_crop.c \
+              libmpcodecs/vf_cropdetect.c \
+              libmpcodecs/vf_decimate.c \
+              libmpcodecs/vf_delogo.c \
+              libmpcodecs/vf_denoise3d.c \
+              libmpcodecs/vf_detc.c \
+              libmpcodecs/vf_dint.c \
+              libmpcodecs/vf_divtc.c \
+              libmpcodecs/vf_down3dright.c \
+              libmpcodecs/vf_dsize.c \
+              libmpcodecs/vf_dvbscale.c \
+              libmpcodecs/vf_eq.c \
+              libmpcodecs/vf_eq2.c \
+              libmpcodecs/vf_expand.c \
+              libmpcodecs/vf_field.c \
+              libmpcodecs/vf_fil.c \
+              libmpcodecs/vf_filmdint.c \
+              libmpcodecs/vf_flip.c \
+              libmpcodecs/vf_format.c \
+              libmpcodecs/vf_framestep.c \
+              libmpcodecs/vf_halfpack.c \
+              libmpcodecs/vf_harddup.c \
+              libmpcodecs/vf_hqdn3d.c \
+              libmpcodecs/vf_hue.c \
+              libmpcodecs/vf_il.c \
+              libmpcodecs/vf_ilpack.c \
+              libmpcodecs/vf_ivtc.c \
+              libmpcodecs/vf_kerndeint.c \
+              libmpcodecs/vf_mirror.c \
+              libmpcodecs/vf_noformat.c \
+              libmpcodecs/vf_noise.c \
+              libmpcodecs/vf_ow.c \
+              libmpcodecs/vf_palette.c \
+              libmpcodecs/vf_perspective.c \
+              libmpcodecs/vf_phase.c \
+              libmpcodecs/vf_pp7.c \
+              libmpcodecs/vf_pullup.c \
+              libmpcodecs/vf_rectangle.c \
+              libmpcodecs/vf_remove_logo.c \
+              libmpcodecs/vf_rgb2bgr.c \
+              libmpcodecs/vf_rgbtest.c \
+              libmpcodecs/vf_rotate.c \
+              libmpcodecs/vf_sab.c \
+              libmpcodecs/vf_scale.c \
+              libmpcodecs/vf_smartblur.c \
+              libmpcodecs/vf_softpulldown.c \
+              libmpcodecs/vf_softskip.c \
+              libmpcodecs/vf_swapuv.c \
+              libmpcodecs/vf_telecine.c \
+              libmpcodecs/vf_test.c \
+              libmpcodecs/vf_tfields.c \
+              libmpcodecs/vf_tile.c \
+              libmpcodecs/vf_tinterlace.c \
+              libmpcodecs/vf_unsharp.c \
+              libmpcodecs/vf_vo.c \
+              libmpcodecs/vf_yadif.c \
+              libmpcodecs/vf_yuvcsp.c \
+              libmpcodecs/vf_yuy2.c \
+              libmpcodecs/vf_yvu9.c \
+              libmpdemux/aac_hdr.c \
+              libmpdemux/asfheader.c \
+              libmpdemux/aviheader.c \
+              libmpdemux/aviprint.c \
+              libmpdemux/demuxer.c \
+              libmpdemux/demux_aac.c \
+              libmpdemux/demux_asf.c \
+              libmpdemux/demux_audio.c \
+              libmpdemux/demux_avi.c \
+              libmpdemux/demux_demuxers.c \
+              libmpdemux/demux_film.c \
+              libmpdemux/demux_fli.c \
+              libmpdemux/demux_lmlm4.c \
+              libmpdemux/demux_mf.c \
+              libmpdemux/demux_mkv.c \
+              libmpdemux/demux_mov.c \
+              libmpdemux/demux_mpg.c \
+              libmpdemux/demux_nsv.c \
+              libmpdemux/demux_nuv.c \
+              libmpdemux/demux_pva.c \
+              libmpdemux/demux_rawaudio.c \
+              libmpdemux/demux_rawvideo.c \
+              libmpdemux/demux_realaud.c \
+              libmpdemux/demux_real.c \
+              libmpdemux/demux_roq.c \
+              libmpdemux/demux_smjpeg.c \
+              libmpdemux/demux_ts.c \
+              libmpdemux/demux_ty.c \
+              libmpdemux/demux_ty_osd.c \
+              libmpdemux/demux_viv.c \
+              libmpdemux/demux_vqf.c \
+              libmpdemux/demux_y4m.c \
+              libmpdemux/ebml.c \
+              libmpdemux/extension.c \
+              libmpdemux/mf.c \
+              libmpdemux/mp3_hdr.c \
+              libmpdemux/mp_taglists.c \
+              libmpdemux/mpeg_hdr.c \
+              libmpdemux/mpeg_packetizer.c \
+              libmpdemux/parse_es.c \
+              libmpdemux/parse_mp4.c \
+              libmpdemux/video.c \
+              libmpdemux/yuv4mpeg.c \
+              libmpdemux/yuv4mpeg_ratio.c \
               libvo/aclib.c \
               libvo/osd.c \
               libvo/sub.c \
               osdep/$(GETCH) \
               osdep/$(TIMER) \
-              talloc.c
-
+              stream/open.c \
+              stream/stream.c \
+              stream/stream_cue.c \
+              stream/stream_file.c \
+              stream/stream_mf.c \
+              stream/stream_null.c \
+              stream/url.c \
+
+SRCS_COMMON-$(AUDIO_INPUT)-$(ALSA1X) += stream/ai_alsa1x.c
+SRCS_COMMON-$(AUDIO_INPUT)-$(ALSA9)  += stream/ai_alsa.c
+SRCS_COMMON-$(AUDIO_INPUT)-$(OSS)    += stream/ai_oss.c
 SRCS_COMMON-$(BITMAP_FONT)           += libvo/font_load.c
+SRCS_COMMON-$(CDDA)                  += stream/stream_cdda.c \
+                                        stream/cdinfo.c
+SRCS_COMMON-$(CDDB)                  += stream/stream_cddb.c
+SRCS_COMMON-$(DVBIN)                 += stream/dvb_tune.c \
+                                        stream/stream_dvb.c
+SRCS_COMMON-$(DVDNAV)                += stream/stream_dvdnav.c
+SRCS_COMMON-$(DVDREAD)               += stream/stream_dvd.c \
+                                        stream/stream_dvd_common.c
+SRCS_COMMON-$(DVDREAD_INTERNAL)      += dvdread/cmd_print.c \
+                                        dvdread/dvd_input.c \
+                                        dvdread/dvd_reader.c \
+                                        dvdread/dvd_udf.c \
+                                        dvdread/ifo_print.c \
+                                        dvdread/ifo_read.c \
+                                        dvdread/md5.c \
+                                        dvdread/nav_print.c \
+                                        dvdread/nav_read.c \
+
+SRCS_COMMON-$(FAAD)                  += libmpcodecs/ad_faad.c
 SRCS_COMMON-$(FREETYPE)              += libvo/font_load_ft.c
+SRCS_COMMON-$(FTP)                   += stream/stream_ftp.c
+SRCS_COMMON-$(GIF)                   += libmpdemux/demux_gif.c
+SRCS_COMMON-$(HAVE_POSIX_SELECT)     += libmpcodecs/vf_bmovl.c
 SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += osdep/mmap_anon.c
 SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += libaf/af_export.c
+SRCS_COMMON-$(JPEG)                  += libmpcodecs/vd_ijpg.c
 SRCS_COMMON-$(LADSPA)                += libaf/af_ladspa.c
+SRCS_COMMON-$(LIBA52)                += libmpcodecs/ad_liba52.c
 SRCS_COMMON-$(LIBASS)                += libass/ass.c \
                                         libass/ass_bitmap.c \
                                         libass/ass_cache.c \
@@ -81,10 +250,115 @@ SRCS_COMMON-$(LIBASS)                += libass/ass.c \
                                         libass/ass_mp.c \
                                         libass/ass_render.c \
                                         libass/ass_utils.c \
-
-SRCS_COMMON-$(LIBAVCODEC)            += libaf/af_lavcresample.c
-SRCS_COMMON-$(LIBAVCODEC_A)          += libaf/af_lavcac3enc.c
+                                        libmpcodecs/vf_ass.c \
+
+SRCS_COMMON-$(LIBAVCODEC)            += libaf/af_lavcresample.c \
+                                        libmpcodecs/ad_ffmpeg.c \
+                                        libmpcodecs/vd_ffmpeg.c \
+                                        libmpcodecs/vf_lavc.c \
+                                        libmpcodecs/vf_lavcdeint.c \
+                                        libmpcodecs/vf_screenshot.c \
+
+# These filters use private headers and do not work with shared libavcodec.
+SRCS_COMMON-$(LIBAVCODEC_A)          += libaf/af_lavcac3enc.c \
+                                        libmpcodecs/vf_fspp.c \
+                                        libmpcodecs/vf_geq.c \
+                                        libmpcodecs/vf_mcdeint.c \
+                                        libmpcodecs/vf_qp.c \
+                                        libmpcodecs/vf_spp.c \
+                                        libmpcodecs/vf_uspp.c \
+
+SRCS_COMMON-$(LIBAVFORMAT)           += libmpdemux/demux_lavf.c
+SRCS_COMMON-$(LIBDCA)                += libmpcodecs/ad_libdca.c
+SRCS_COMMON-$(LIBDV)                 += libmpcodecs/ad_libdv.c \
+                                        libmpcodecs/vd_libdv.c \
+                                        libmpdemux/demux_rawdv.c
+SRCS_COMMON-$(LIBDVDCSS_INTERNAL)    += libdvdcss/css.c \
+                                        libdvdcss/device.c \
+                                        libdvdcss/error.c \
+                                        libdvdcss/ioctl.c \
+                                        libdvdcss/libdvdcss.c \
+                                        #libdvdcss/bsdi_ioctl \
+
+SRCS_COMMON-$(FAAD_INTERNAL)         += libfaad2/bits.c \
+                                        libfaad2/cfft.c \
+                                        libfaad2/common.c \
+                                        libfaad2/decoder.c \
+                                        libfaad2/drc.c \
+                                        libfaad2/drm_dec.c \
+                                        libfaad2/error.c \
+                                        libfaad2/filtbank.c \
+                                        libfaad2/hcr.c \
+                                        libfaad2/huffman.c \
+                                        libfaad2/ic_predict.c \
+                                        libfaad2/is.c \
+                                        libfaad2/lt_predict.c \
+                                        libfaad2/mdct.c \
+                                        libfaad2/mp4.c \
+                                        libfaad2/ms.c \
+                                        libfaad2/output.c \
+                                        libfaad2/pns.c \
+                                        libfaad2/ps_dec.c \
+                                        libfaad2/ps_syntax.c  \
+                                        libfaad2/pulse.c \
+                                        libfaad2/rvlc.c \
+                                        libfaad2/sbr_dct.c \
+                                        libfaad2/sbr_dec.c \
+                                        libfaad2/sbr_e_nf.c \
+                                        libfaad2/sbr_fbt.c \
+                                        libfaad2/sbr_hfadj.c \
+                                        libfaad2/sbr_hfgen.c \
+                                        libfaad2/sbr_huff.c \
+                                        libfaad2/sbr_qmf.c \
+                                        libfaad2/sbr_syntax.c \
+                                        libfaad2/sbr_tf_grid.c \
+                                        libfaad2/specrec.c \
+                                        libfaad2/ssr.c \
+                                        libfaad2/ssr_fb.c \
+                                        libfaad2/ssr_ipqf.c \
+                                        libfaad2/syntax.c \
+                                        libfaad2/tns.c \
+
+SRCS_COMMON-$(LIBMAD)                += libmpcodecs/ad_libmad.c
+SRCS_COMMON-$(LIBMPEG2)              += libmpcodecs/vd_libmpeg2.c
+SRCS_COMMON-$(LIBNEMESI)             += libmpdemux/demux_nemesi.c \
+                                        stream/stream_nemesi.c
+SRCS_COMMON-$(LIBNUT)                += libmpdemux/demux_nut.c
+SRCS_COMMON-$(LIBPOSTPROC)           += libmpcodecs/vf_pp.c
+SRCS_COMMON-$(LIBSMBCLIENT)          += stream/stream_smb.c
+SRCS_COMMON-$(LIBTHEORA)             += libmpcodecs/vd_theora.c
+SRCS_COMMON-$(LIBVORBIS)             += libmpcodecs/ad_libvorbis.c \
+                                        libmpdemux/demux_ogg.c
 SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c
+SRCS_COMMON-$(MP3LIB)                += libmpcodecs/ad_mp3lib.c
+SRCS_COMMON-$(MPLAYER_NETWORK)       += stream/stream_netstream.c \
+                                        stream/asf_mmst_streaming.c \
+                                        stream/asf_streaming.c \
+                                        stream/cookies.c \
+                                        stream/http.c \
+                                        stream/network.c \
+                                        stream/pnm.c \
+                                        stream/rtp.c \
+                                        stream/udp.c \
+                                        stream/tcp.c \
+                                        stream/stream_rtp.c \
+                                        stream/stream_udp.c \
+                                        stream/realrtsp/asmrp.c \
+                                        stream/realrtsp/real.c \
+                                        stream/realrtsp/rmff.c \
+                                        stream/realrtsp/sdpplin.c \
+                                        stream/realrtsp/xbuffer.c \
+
+SRCS_COMMON-$(MUSEPACK)              += libmpcodecs/ad_mpc.c \
+                                        libmpdemux/demux_mpc.c
+SRCS_COMMON-$(NATIVE_RTSP)           += stream/stream_rtsp.c \
+                                        stream/freesdp/common.c \
+                                        stream/freesdp/errorlist.c \
+                                        stream/freesdp/parser.c \
+                                        stream/librtsp/rtsp.c \
+                                        stream/librtsp/rtsp_rtp.c \
+                                        stream/librtsp/rtsp_session.c \
+
 SRCS_COMMON-$(NEED_GETTIMEOFDAY)     += osdep/gettimeofday.c
 SRCS_COMMON-$(NEED_GLOB)             += osdep/glob-win.c
 SRCS_COMMON-$(NEED_MMAP)             += osdep/mmap-os2.c
@@ -93,6 +367,20 @@ SRCS_COMMON-$(NEED_SHMEM)            += osdep/shmem.c
 SRCS_COMMON-$(NEED_STRSEP)           += osdep/strsep.c
 SRCS_COMMON-$(NEED_SWAB)             += osdep/swab.c
 SRCS_COMMON-$(NEED_VSSCANF)          += osdep/vsscanf.c
+SRCS_COMMON-$(PNG)                   += libmpcodecs/vd_mpng.c
+SRCS_COMMON-$(PVR)                   += stream/stream_pvr.c
+SRCS_COMMON-$(QTX_CODECS)            += libmpcodecs/ad_qtaudio.c \
+                                        libmpcodecs/vd_qtvideo.c
+SRCS_COMMON-$(RADIO)                 += stream/stream_radio.c
+SRCS_COMMON-$(RADIO_CAPTURE)         += stream/audio_in.c
+SRCS_COMMON-$(REAL_CODECS)           += libmpcodecs/ad_realaud.c \
+                                        libmpcodecs/vd_realvid.c
+SRCS_COMMON-$(SPEEX)                 += libmpcodecs/ad_speex.c
+SRCS_COMMON-$(STREAM_CACHE)          += stream/cache2.c
+SRCS_COMMON-$(STREAMING_LIVE555)     += libmpdemux/demux_rtp.cpp \
+                                        libmpdemux/demux_rtp_codec.cpp \
+                                        stream/stream_livedotcom.c \
+
 SRCS_COMMON-$(TREMOR_INTERNAL)       += tremor/bitwise.c \
                                         tremor/block.c \
                                         tremor/codebook.c \
@@ -108,7 +396,32 @@ SRCS_COMMON-$(TREMOR_INTERNAL)       += tremor/bitwise.c \
                                         tremor/synthesis.c \
                                         tremor/window.c \
 
+SRCS_COMMON-$(TV)                    += stream/stream_tv.c stream/tv.c \
+                                        stream/frequencies.c stream/tvi_dummy.c
+SRCS_COMMON-$(TV_BSDBT848)           += stream/tvi_bsdbt848.c
+SRCS_COMMON-$(TV_DSHOW)              += stream/tvi_dshow.c
+SRCS_COMMON-$(TV_TELETEXT)           += stream/tvi_vbi.c
+SRCS_COMMON-$(TV_V4L1)               += stream/tvi_v4l.c  stream/audio_in.c
+SRCS_COMMON-$(TV_V4L2)               += stream/tvi_v4l2.c stream/audio_in.c
 SRCS_COMMON-$(UNRAR_EXEC)            += unrar_exec.c
+SRCS_COMMON-$(VCD)                   += stream/stream_vcd.c
+SRCS_COMMON-$(VSTREAM)               += stream/stream_vstream.c
+SRCS_COMMON-$(WIN32DLL)              += libmpcodecs/ad_acm.c \
+                                        libmpcodecs/ad_dmo.c \
+                                        libmpcodecs/ad_dshow.c \
+                                        libmpcodecs/ad_twin.c \
+                                        libmpcodecs/vd_dmo.c \
+                                        libmpcodecs/vd_dshow.c \
+                                        libmpcodecs/vd_vfw.c \
+                                        libmpcodecs/vd_vfwex.c \
+                                        libmpdemux/demux_avs.c \
+
+SRCS_COMMON-$(XANIM_CODECS)          += libmpcodecs/vd_xanim.c
+SRCS_COMMON-$(XMMS_PLUGINS)          += libmpdemux/demux_xmms.c
+SRCS_COMMON-$(XVID4)                 += libmpcodecs/vd_xvid4.c
+SRCS_COMMON-$(ZORAN)                 += libmpcodecs/vd_zrmjpeg.c \
+                                        libmpcodecs/vf_zrmjpeg.c
+
 
 SRCS_MPLAYER = mplayer.c \
                m_property.c \
@@ -194,11 +507,30 @@ SRCS_MENCODER = mencoder.c \
                 mp_msg-mencoder.c \
                 parser-mecmd.c \
                 xvid_vbr.c \
-
-COMMON_LIBS = libmpcodecs/libmpcodecs.a \
-              libmpdemux/libmpdemux.a \
-              stream/stream.a \
-              libswscale/libswscale.a \
+                libmpcodecs/ae.c \
+                libmpcodecs/ae_pcm.c \
+                libmpcodecs/ve.c \
+                libmpcodecs/ve_raw.c \
+                libmpdemux/muxer.c \
+                libmpdemux/muxer_avi.c \
+                libmpdemux/muxer_mpeg.c \
+                libmpdemux/muxer_rawaudio.c \
+                libmpdemux/muxer_rawvideo.c \
+
+SRCS_MENCODER-$(FAAC)             += libmpcodecs/ae_faac.c
+SRCS_MENCODER-$(LIBAVCODEC)       += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c
+SRCS_MENCODER-$(LIBAVFORMAT)      += libmpdemux/muxer_lavf.c
+SRCS_MENCODER-$(LIBDV)            += libmpcodecs/ve_libdv.c
+SRCS_MENCODER-$(LIBLZO)           += libmpcodecs/ve_nuv.c
+SRCS_MENCODER-$(MP3LAME)          += libmpcodecs/ae_lame.c
+SRCS_MENCODER-$(QTX_CODECS)       += libmpcodecs/ve_qtvideo.c
+SRCS_MENCODER-$(TOOLAME)          += libmpcodecs/ae_toolame.c
+SRCS_MENCODER-$(TWOLAME)          += libmpcodecs/ae_twolame.c
+SRCS_MENCODER-$(WIN32DLL)         += libmpcodecs/ve_vfw.c
+SRCS_MENCODER-$(X264)             += libmpcodecs/ve_x264.c
+SRCS_MENCODER-$(XVID4)            += libmpcodecs/ve_xvid4.c
+
+COMMON_LIBS = libswscale/libswscale.a \
 
 COMMON_LIBS-$(LIBAVFORMAT_A)      += libavformat/libavformat.a
 COMMON_LIBS-$(LIBAVCODEC_A)       += libavcodec/libavcodec.a
@@ -208,15 +540,9 @@ COMMON_LIBS-$(WIN32DLL)           += loader/loader.a
 COMMON_LIBS-$(MP3LIB)             += mp3lib/mp3lib.a
 COMMON_LIBS-$(LIBA52)             += liba52/liba52.a
 COMMON_LIBS-$(LIBMPEG2)           += libmpeg2/libmpeg2.a
-COMMON_LIBS-$(FAAD_INTERNAL)      += libfaad2/libfaad2.a
-COMMON_LIBS-$(DVDREAD_INTERNAL)   += dvdread/dvdread.a
-COMMON_LIBS-$(DVDCSS_INTERNAL)    += libdvdcss/libdvdcss.a
 
 LIBS_MPLAYER-$(VIDIX)             += vidix/vidix.a
 
-LIBS_MENCODER = libmpcodecs/libmpencoders.a \
-                libmpdemux/libmpmux.a \
-
 ALL_PRG-$(MPLAYER)  += mplayer$(EXESUF)
 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
 
@@ -233,27 +559,22 @@ INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man
 INSTALL_TARGETS-$(GUI)      += install-gui
 INSTALL_TARGETS             += $(INSTALL_TARGETS-yes)
 
-PARTS = dvdread \
-        liba52 \
+PARTS = liba52 \
         libavcodec \
         libavformat \
         libavutil \
-        libdvdcss \
-        libfaad2 \
-        libmpcodecs \
-        libmpdemux \
         libmpeg2 \
         libpostproc \
         libswscale \
         mp3lib \
-        stream \
         vidix \
 
-ifdef ARCH_X86
+ifeq ($(WIN32DLL),yes)
 PARTS += loader
 endif
 
-DIRS =  gui \
+DIRS =  dvdread \
+        gui \
         gui/mplayer \
         gui/mplayer/gtk \
         gui/skin \
@@ -263,9 +584,18 @@ DIRS =  gui \
         libaf \
         libao2 \
         libass \
+        libdvdcss \
+        libfaad2 \
         libmenu \
+        libmpcodecs \
+        libmpcodecs/native \
+        libmpdemux \
         libvo \
         osdep \
+        stream \
+        stream/freesdp \
+        stream/librtsp \
+        stream/realrtsp \
         tremor \
         TOOLS \
 
@@ -274,13 +604,16 @@ all:	recurse $(ALL_PRG)
 recurse:
 	for part in $(PARTS); do $(MAKE) -C $$part; done
 
-DEPS = $(SRCS_COMMON:.c=.d) $(SRCS_MPLAYER:.c=.d) $(SRCS_MENCODER:.c=.d)
-$(DEPS): help_mp.h version.h codecs.conf.h
-dep depend: $(DEPS)
-	for part in $(PARTS); do $(MAKE) -C $$part .depend; done
+# Hack to keep .depend from being generated at the top level unnecessarily.
+DEPS = foo
 
 include mpcommon.mak
 
+DEPS = $(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER)))
+$(DEPS) recurse: help_mp.h version.h codecs.conf.h
+dep depend: $(DEPS)
+	for part in $(PARTS); do $(MAKE) -C $$part .depend; done
+
 CFLAGS := $(subst -I..,-I.,$(CFLAGS))
 
 define RECURSIVE_RULE
@@ -290,12 +623,6 @@ endef
 
 $(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE)))
 
-libmpcodecs/libmpencoders.a:
-	$(MAKE) -C libmpcodecs libmpencoders.a
-
-libmpdemux/libmpmux.a:
-	$(MAKE) -C libmpdemux libmpmux.a
-
 mplayer$(EXESUF): $(MPLAYER_DEPS)
 	$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
 
@@ -319,6 +646,15 @@ codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o
 osdep/mplayer-rc.o: osdep/mplayer.rc version.h
 	$(WINDRES) -o $@ $<
 
+dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE
+ifeq ($(LIBDVDCSS_INTERNAL),yes)
+dvdread/%.o dvdread/%.d: CFLAGS += -Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H
+endif
+libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\"
+libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE
+
+libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec
+
 install: install-dirs $(INSTALL_TARGETS)
 
 install-dirs:
@@ -457,7 +793,7 @@ TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \
 TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32
 
 #FIXME: Linking is broken, help welcome.
-TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c libmpdemux/libmpdemux.a $(TOOLS_COMMON_LIBS)
+TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(TOOLS_COMMON_LIBS)
 
 fastmemcpybench: TOOLS/fastmemcpybench.c
 	$(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF)  -DNAME=\"mmx\"      -DHAVE_MMX
@@ -481,11 +817,7 @@ fastmemcpybench realcodecs: CFLAGS += -g
 
 # FIXME: netstream linking is a mess that should be fixed properly some day.
 # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled.
-NETSTREAM_DEPS = libmpdemux/libmpdemux.a \
-                 stream/stream.a \
-                 dvdread/libdvdread.a \
-                 libdvdcss/libdvdcss.a \
-                 libavutil/libavutil.a \
+NETSTREAM_DEPS = libavutil/libavutil.a \
                  m_option.o \
                  m_struct.o \
                  $(TOOLS_COMMON_LIBS)
@@ -497,4 +829,6 @@ toolsclean:
 	rm -f $(TOOLS) TOOLS/fastmem*-* TOOLS/netstream$(EXESUF)
 	rm -f TOOLS/bmovl-test$(EXESUF) TOOLS/vfw2menc$(EXESUF) $(REAL_TARGETS)
 
+-include $(DEPS)
+
 .PHONY: all doxygen *install* recurse strip tools