[MPlayer-cvslog] r26523 - in trunk: Makefile libmpdemux libmpdemux/Makefile
diego
subversion at mplayerhq.hu
Fri Apr 25 00:05:43 CEST 2008
Author: diego
Date: Fri Apr 25 00:05:43 2008
New Revision: 26523
Log:
Merge libmpdemux/Makefile into top-level Makefile.
Removed:
trunk/libmpdemux/Makefile
Modified:
trunk/Makefile
trunk/libmpdemux/ (props changed)
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Apr 25 00:05:43 2008
@@ -150,6 +150,50 @@ SRCS_COMMON = asxparser.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 \
@@ -178,6 +222,7 @@ SRCS_COMMON-$(DVDREAD) +=
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
@@ -211,16 +256,21 @@ SRCS_COMMON-$(LIBAVCODEC_A) +=
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
+ libmpcodecs/vd_libdv.c \
+ libmpdemux/demux_rawdv.c
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c
-SRCS_COMMON-$(LIBNEMESI) += stream/stream_nemesi.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
+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 \
@@ -241,7 +291,8 @@ SRCS_COMMON-$(MPLAYER_NETWORK) +=
stream/realrtsp/sdpplin.c \
stream/realrtsp/xbuffer.c \
-SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.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 \
@@ -268,7 +319,10 @@ SRCS_COMMON-$(REAL_CODECS) +=
libmpcodecs/vd_realvid.c
SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c
SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c
-SRCS_COMMON-$(STREAMING_LIVE555) += stream/stream_livedotcom.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 \
@@ -302,8 +356,10 @@ SRCS_COMMON-$(WIN32DLL) +=
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
@@ -396,9 +452,15 @@ SRCS_MENCODER = mencoder.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
@@ -409,8 +471,7 @@ SRCS_MENCODER-$(WIN32DLL) += lib
SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c
SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c
-COMMON_LIBS = libmpdemux/libmpdemux.a \
- libswscale/libswscale.a \
+COMMON_LIBS = libswscale/libswscale.a \
COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a
COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a
@@ -426,8 +487,6 @@ COMMON_LIBS-$(DVDCSS_INTERNAL) += lib
LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a
-LIBS_MENCODER = libmpdemux/libmpmux.a \
-
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
@@ -451,7 +510,6 @@ PARTS = dvdread \
libavutil \
libdvdcss \
libfaad2 \
- libmpdemux \
libmpeg2 \
libpostproc \
libswscale \
@@ -475,6 +533,7 @@ DIRS = gui \
libmenu \
libmpcodecs \
libmpcodecs/native \
+ libmpdemux \
libvo \
osdep \
stream \
@@ -508,9 +567,6 @@ endef
$(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE)))
-libmpdemux/libmpmux.a:
- $(MAKE) -C libmpdemux libmpmux.a
-
mplayer$(EXESUF): $(MPLAYER_DEPS)
$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
@@ -534,6 +590,8 @@ codec-cfg-test$(EXESUF): codecs.conf.h c
osdep/mplayer-rc.o: osdep/mplayer.rc version.h
$(WINDRES) -o $@ $<
+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:
@@ -672,7 +730,7 @@ TOOLS/subrip$(EXESUF): TOOLS/subrip.c vo
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
@@ -696,8 +754,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 \
- dvdread/libdvdread.a \
+NETSTREAM_DEPS = dvdread/libdvdread.a \
libdvdcss/libdvdcss.a \
libavutil/libavutil.a \
m_option.o \
More information about the MPlayer-cvslog
mailing list