[MPlayer-cvslog] r19277 - in trunk: Copyright Gui/mplayer/common.c Gui/mplayer/gtk/fs.c Gui/mplayer/gtk/menu.c Gui/mplayer/mw.c Gui/mplayer/pb.c Gui/mplayer/play.c Gui/win32/dialogs.c Gui/win32/gui.c Gui/win32/interface.c Makefile TOOLS/Makefile TOOLS/netstream/Makefile TOOLS/netstream/netstream.c asxparser.c cfg-common.h libmenu/menu.c libmenu/menu_dvbin.c libmpcodecs/Makefile libmpdemux/Makefile libmpdemux/ai_alsa.c libmpdemux/ai_alsa1x.c libmpdemux/ai_oss.c libmpdemux/asf_mmst_streaming.c libmpdemux/asf_streaming.c libmpdemux/audio_in.c libmpdemux/audio_in.h libmpdemux/cache2.c libmpdemux/cdd.h libmpdemux/cdda.c libmpdemux/cddb.c libmpdemux/cdinfo.c libmpdemux/cookies.c libmpdemux/cookies.h libmpdemux/cue_read.c libmpdemux/cue_read.h libmpdemux/dvb_tune.c libmpdemux/dvbin.c libmpdemux/dvbin.h libmpdemux/dvdnav_stream.c libmpdemux/dvdnav_stream.h libmpdemux/freesdp libmpdemux/frequencies.c libmpdemux/frequencies.h libmpdemux/http.c libmpdemux/http.h libmpdemux/librtsp libmpdemux/mf.c libmpdemux/mf.h libmpdemux/netstream.h libmpdemux/network.c libmpdemux/network.h libmpdemux/open.c libmpdemux/pnm.c libmpdemux/realrtsp libmpdemux/rtp.c libmpdemux/rtp.h libmpdemux/stream.c libmpdemux/stream.h libmpdemux/stream_dvd.c libmpdemux/stream_dvd.h libmpdemux/stream_file.c libmpdemux/stream_ftp.c libmpdemux/stream_livedotcom.c libmpdemux/stream_netstream.c libmpdemux/stream_null.c libmpdemux/stream_pvr.c libmpdemux/stream_rtsp.c libmpdemux/stream_smb.c libmpdemux/stream_vcd.c libmpdemux/stream_vstream.c libmpdemux/tv.c libmpdemux/tv.h libmpdemux/tvi_bsdbt848.c libmpdemux/tvi_def.h libmpdemux/tvi_dummy.c libmpdemux/tvi_v4l.c libmpdemux/tvi_v4l2.c libmpdemux/url.c libmpdemux/url.h libmpdemux/vcd_read.h libmpdemux/vcd_read_darwin.h libmpdemux/vcd_read_fbsd.h libmpdemux/vcd_read_nbsd.h m_option.c mencoder.c mplayer.c osdep/macosx_finder_args.c playtreeparser.c stream stream/Makefile stream/ai_alsa.c stream/ai_alsa1x.c stream/ai_oss.c stream/asf_mmst_streaming.c stream/asf_streaming.c stream/audio_in.c stream/audio_in.h stream/cache2.c stream/cdd.h stream/cdda.c stream/cddb.c stream/cdinfo.c stream/cookies.c stream/cookies.h stream/cue_read.c stream/cue_read.h stream/dvb_tune.c stream/dvbin.c stream/dvbin.h stream/dvdnav_stream.c stream/dvdnav_stream.h stream/freesdp stream/frequencies.c stream/frequencies.h stream/http.c stream/http.h stream/librtsp stream/mf.c stream/mf.h stream/netstream.h stream/network.c stream/network.h stream/open.c stream/pnm.c stream/realrtsp stream/rtp.c stream/rtp.h stream/stream.c stream/stream.h stream/stream_dvd.c stream/stream_dvd.h stream/stream_file.c stream/stream_ftp.c stream/stream_livedotcom.c stream/stream_netstream.c stream/stream_null.c stream/stream_pvr.c stream/stream_rtsp.c stream/stream_smb.c stream/stream_vcd.c stream/stream_vstream.c stream/tv.c stream/tv.h stream/tvi_bsdbt848.c stream/tvi_def.h stream/tvi_dummy.c stream/tvi_v4l.c stream/tvi_v4l2.c stream/url.c stream/url.h stream/vcd_read.h stream/vcd_read_darwin.h stream/vcd_read_fbsd.h stream/vcd_read_nbsd.h subreader.c
Michael Niedermayer
michaelni at gmx.at
Sat Aug 5 16:09:21 CEST 2006
Hi
On Mon, Jul 31, 2006 at 07:39:18PM +0200, ben wrote:
[...]
> Modified: trunk/libmpdemux/Makefile
> ==============================================================================
> --- trunk/libmpdemux/Makefile (original)
> +++ trunk/libmpdemux/Makefile Mon Jul 31 19:39:17 2006
[...]
> -ifeq ($(CDDA),yes)
> -SRCS += cdda.c
> - ifeq ($(MPLAYER_NETWORK),yes)
> - SRCS += cddb.c
> - endif
> -endif
> -
> -# Stream readers/writers
> -SRCS += stream.c \
> - stream_file.c \
> - stream_null.c \
> -
> -ifeq ($(HAVE_DVD),yes)
> -SRCS += stream_dvd.c
> -endif
> -ifeq ($(DVDNAV),yes)
> -SRCS += dvdnav_stream.c
> -endif
> -ifeq ($(VCD),yes)
> -SRCS += stream_vcd.c
> -endif
> -ifeq ($(FTP),yes)
> -SRCS += stream_ftp.c
> -endif
> -ifeq ($(LIBSMBCLIENT),yes)
> -SRCS += stream_smb.c
> -endif
> -ifeq ($(MPLAYER_NETWORK),yes)
> - SRCS += stream_netstream.c
> - ifeq ($(STREAMING_LIVE555),yes)
> - SRCS += stream_livedotcom.c
> - endif
> -endif
> -ifeq ($(VSTREAM),yes)
> -SRCS += stream_vstream.c
> -endif
> -
> -# TV in
> -ifeq ($(TV),yes)
> -SRCS += tv.c frequencies.c tvi_dummy.c
> - ifeq ($(TV_BSDBT848),yes)
> - SRCS += tvi_bsdbt848.c
> - endif
> - ifeq ($(TV_V4L2),yes)
> - SRCS += tvi_v4l2.c audio_in.c
> - ifeq ($(PVR),yes)
> - SRCS += stream_pvr.c
> - endif
> - endif
> - ifeq ($(TV_V4L1),yes)
> - SRCS += tvi_v4l.c audio_in.c
> - endif
> - ifeq ($(TV_V4L),yes)
> - ifeq ($(ALSA1X),yes)
> - SRCS += ai_alsa1x.c
> - endif
> - ifeq ($(ALSA9),yes)
> - SRCS += ai_alsa.c
> - endif
> - ifeq ($(OSS),yes)
> - SRCS += ai_oss.c
> - endif
> - endif
> -endif
> -
> # Demuxers
> SRCS += demuxer.c \
> demux_aac.c \
> @@ -166,48 +92,18 @@
> MUXERS += muxer_lavf.c
> endif
>
> -ifeq ($(MPLAYER_NETWORK),yes)
> -SRCS += asf_streaming.c \
> - http.c \
> - network.c \
> - cookies.c \
> - asf_mmst_streaming.c \
> - pnm.c \
> - rtp.c \
> - stream_rtsp.c \
> -
> -SRCS += realrtsp/asmrp.c \
> - realrtsp/real.c \
> - realrtsp/rmff.c \
> - realrtsp/sdpplin.c \
> - realrtsp/xbuffer.c \
> -
> -SRCS += librtsp/rtsp.c \
> - librtsp/rtsp_rtp.c \
> - librtsp/rtsp_session.c \
> -
> -SRCS += freesdp/common.c \
> - freesdp/errorlist.c \
> - freesdp/parser.c \
[...]
> Added: trunk/stream/Makefile
> ==============================================================================
> --- (empty file)
> +++ trunk/stream/Makefile Mon Jul 31 19:39:17 2006
[...]
> +ifeq ($(CDDA),yes)
> +SRCS += cdda.c
> + ifeq ($(MPLAYER_NETWORK),yes)
> + SRCS += cddb.c
> + endif
> +endif
> +
> +# Stream readers/writers
> +SRCS += stream.c \
> + stream_file.c \
> + stream_null.c \
> +
> +ifeq ($(HAVE_DVD),yes)
> +SRCS += stream_dvd.c
> +endif
> +ifeq ($(DVDNAV),yes)
> +SRCS += dvdnav_stream.c
> +endif
> +ifeq ($(VCD),yes)
> +SRCS += stream_vcd.c
> +endif
> +ifeq ($(FTP),yes)
> +SRCS += stream_ftp.c
> +endif
> +ifeq ($(LIBSMBCLIENT),yes)
> +SRCS += stream_smb.c
> +endif
> +ifeq ($(MPLAYER_NETWORK),yes)
> + SRCS += stream_netstream.c
> + ifeq ($(STREAMING_LIVE555),yes)
> + SRCS += stream_livedotcom.c
> + endif
> +endif
> +ifeq ($(VSTREAM),yes)
> +SRCS += stream_vstream.c
> +endif
> +
> +# TV in
> +ifeq ($(TV),yes)
> +SRCS += tv.c frequencies.c tvi_dummy.c
> + ifeq ($(TV_BSDBT848),yes)
> + SRCS += tvi_bsdbt848.c
> + endif
> + ifeq ($(TV_V4L2),yes)
> + SRCS += tvi_v4l2.c audio_in.c
> + ifeq ($(PVR),yes)
> + SRCS += stream_pvr.c
> + endif
> + endif
> + ifeq ($(TV_V4L1),yes)
> + SRCS += tvi_v4l.c audio_in.c
> + endif
> + ifeq ($(TV_V4L),yes)
> + ifeq ($(ALSA1X),yes)
> + SRCS += ai_alsa1x.c
> + endif
> + ifeq ($(ALSA9),yes)
> + SRCS += ai_alsa.c
> + endif
> + ifeq ($(OSS),yes)
> + SRCS += ai_oss.c
> + endif
> + endif
> +endif
> +
> +ifeq ($(MPLAYER_NETWORK),yes)
> +SRCS += asf_streaming.c \
> + http.c \
> + network.c \
> + cookies.c \
> + asf_mmst_streaming.c \
> + pnm.c \
> + rtp.c \
> + stream_rtsp.c \
> +
> +SRCS += realrtsp/asmrp.c \
> + realrtsp/real.c \
> + realrtsp/rmff.c \
> + realrtsp/sdpplin.c \
> + realrtsp/xbuffer.c \
> +
> +SRCS += librtsp/rtsp.c \
> + librtsp/rtsp_rtp.c \
> + librtsp/rtsp_session.c \
> +
> +SRCS += freesdp/common.c \
> + freesdp/errorlist.c \
> + freesdp/parser.c \
> +
> +endif
this too should have been svn cp IMHO
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
In the past you could go to a library and read, borrow or copy any book
Today you'd get arrested for mere telling someone where the library is
More information about the MPlayer-cvslog
mailing list