RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-13 02:16:40 +00:00
Code Issues Releases Wiki Activity

Split muxers into a separate library that only MEncoder is linked against.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21326 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-11-27 14:26:52 +00:00
parent 2a86b5b99e
commit 02436df5fc
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -66,6 +66,7 @@ LIBS_MPLAYER = libvo/libvo.a \
input/libinput.a \ input/libinput.a \
LIBS_MENCODER = libmpcodecs/libmpencoders.a \ LIBS_MENCODER = libmpcodecs/libmpencoders.a \
libmpdemux/libmpmux.a \
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
@ -165,7 +166,10 @@ libass/libass.a:
$(MAKE) -C libass $(MAKE) -C libass
libmpdemux/libmpdemux.a: libmpdemux/libmpdemux.a:
$(MAKE) -C libmpdemux $(MAKE) -C libmpdemux libmpdemux.a
libmpdemux/libmpmux.a:
$(MAKE) -C libmpdemux libmpmux.a
stream/stream.a: stream/stream.a:
$(MAKE) -C stream $(MAKE) -C stream
@ -393,6 +397,7 @@ dvdread/libdvdread.a: .norecurse $(wildcard dvdread/*.[ch])
libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch]) libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch])
libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch]) libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch])
libmpdemux/libmpmux.a: .norecurse $(wildcard libmpdemux/*.[ch])
stream/stream.a: .norecurse $(wildcard stream/*.[ch] stream/*/*.[ch]) stream/stream.a: .norecurse $(wildcard stream/*.[ch] stream/*/*.[ch])
libmpcodecs/libmpcodecs.a: .norecurse $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch]) libmpcodecs/libmpcodecs.a: .norecurse $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch])
libmpcodecs/libmpencoders.a: .norecurse $(wildcard libmpcodecs/*.[ch]) libmpcodecs/libmpencoders.a: .norecurse $(wildcard libmpcodecs/*.[ch])

17
libmpdemux/Makefile
View File

@ -1,8 +1,11 @@
LIBNAME = libmpdemux.a
include ../config.mak include ../config.mak
LIBNAME = libmpdemux.a
ifeq ($(MENCODER),yes)
LIBNAME2 = libmpmux.a
endif
# Headers and header-dumpers # Headers and header-dumpers
SRCS = mp3_hdr.c \ SRCS = mp3_hdr.c \
mpeg_hdr.c \ mpeg_hdr.c \
@ -63,18 +66,14 @@ SRCS-$(STREAMING_LIVE555) += demux_rtp.cpp demux_rtp_codec.cpp
SRCS-$(WIN32DLL) += demux_avs.c SRCS-$(WIN32DLL) += demux_avs.c
SRCS-$(XMMS_PLUGINS) += demux_xmms.c SRCS-$(XMMS_PLUGINS) += demux_xmms.c
# Muxers SRCS2 = muxer.c \
MUXERS = muxer.c \
muxer_avi.c \ muxer_avi.c \
muxer_mpeg.c \ muxer_mpeg.c \
muxer_rawaudio.c \ muxer_rawaudio.c \
muxer_rawvideo.c \ muxer_rawvideo.c \
MUXERS-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c SRCS2-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c
MUXERS-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c SRCS2-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c
SRCS-$(MENCODER) += $(MUXERS)
SRCS-$(MENCODER) += $(MUXERS-yes)
LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I../libavutil LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I../libavutil
LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I../libavcodec LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I../libavcodec