RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-19 09:57:34 +00:00
Code Issues Releases Wiki Activity

Merge svn changes up to r26540

Browse Source 
Conflicts:

	Makefile
This commit is contained in:
Uoti Urpala 2008-04-26 09:39:09 +03:00
commit 2b47fd59ab
30 changed files with 418 additions and 465 deletions

410
Makefile
View File

@ -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 \
libmpcodecs/vf_ass.c \
SRCS_COMMON-$(LIBAVCODEC) += libaf/af_lavcresample.c
SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.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 \
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 \
COMMON_LIBS = libmpcodecs/libmpcodecs.a \
libmpdemux/libmpdemux.a \
stream/stream.a \
libswscale/libswscale.a \
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

11
configure vendored
View File

@ -6180,7 +6180,12 @@ if test "$_faad_internal" = yes ; then
_def_faad_internal="#define USE_FAAD_INTERNAL 1"
_faad=yes
_res_comment="internal floating-point"
test "$_faad_fixed" = yes && _res_comment="internal fixed-point"
if test "$_faad_fixed" = yes ; then
# The FIXED_POINT implementation of FAAD2 improves performance
# on some platforms, especially for SBR files.
CFLAGS="$CFLAGS -DFIXED_POINT"
_res_comment="internal fixed-point"
fi
elif test "$_faad_external" = yes ; then
_faad=yes
_ld_extra="$_ld_extra -lfaad"
@ -7778,7 +7783,7 @@ PVR = $_pvr
VCD = $_vcd
DVDREAD = $_dvdread
DVDREAD_INTERNAL = $_dvdread_internal
DVDCSS_INTERNAL = $_libdvdcss_internal
LIBDVDCSS_INTERNAL = $_libdvdcss_internal
DVDNAV = $_dvdnav
WIN32DLL = $_win32dll
WIN32_EMULATION = $_win32_emulation
@ -7804,7 +7809,6 @@ LIBMAD = $_mad
LIBVORBIS = $_vorbis
LIBTHEORA = $_theora
FAAD_INTERNAL = $_faad_internal
FAAD_FIXED = $_faad_fixed
LIBSMBCLIENT = $_smbsupport
XMMS_PLUGINS = $_xmms
MACOSX_FINDER_SUPPORT = $_macosx_finder_support
@ -7898,6 +7902,7 @@ HAVE_XVMC = $_xvmc
DEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&,"
MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&,"
MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&,"
EOF

19
dvdread/Makefile
View File

@ -1,19 +0,0 @@
include ../config.mak
LIBNAME_COMMON = dvdread.a
SRCS_COMMON = cmd_print.c \
dvd_input.c \
dvd_reader.c \
dvd_udf.c \
ifo_print.c \
ifo_read.c \
md5.c \
nav_print.c \
nav_read.c \
CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE
CFLAGS-$(DVDCSS_INTERNAL) += -I../libdvdcss -DHAVE_DVDCSS_DVDCSS_H
include ../mpcommon.mak

2
help/help_mp-bg.h
View File

@ -331,7 +331,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "грешка в конфигурационния файл"
#define MSGTR_ErrorParsingCommandLine "грешка при обработката на командния ред"
#define MSGTR_VideoStreamRequired "Задължително е да има видео поток!\n"
#define MSGTR_ForcingInputFPS "Входящите кадри в секунда ще се интерпретират като %5.2f\n"
#define MSGTR_ForcingInputFPS "Входящите кадри в секунда ще се интерпретират като %5.3f\n"
#define MSGTR_RawvideoDoesNotSupportAudio "Изходния формат RAWVIDEO не поддържа аудио - звука се премахва\n"
#define MSGTR_DemuxerDoesntSupportNosound "Tози разпределител все още не поддържа -nosound .\n"
#define MSGTR_MemAllocFailed "не може да задели памет"

4
help/help_mp-cs.h
View File

@ -396,7 +396,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "chyba konfiguračního souboru"
#define MSGTR_ErrorParsingCommandLine "chyba při zpracovávání příkazového řádku"
#define MSGTR_VideoStreamRequired "Videoproud je povinný!\n"
#define MSGTR_ForcingInputFPS "Vstupní fps bude interpretováno jako %5.2f\n"
#define MSGTR_ForcingInputFPS "Vstupní fps bude interpretováno jako %5.3f\n"
#define MSGTR_RawvideoDoesNotSupportAudio "Výstupní formát souboru RAWVIDEO nepodporuje zvuk - vypínám ho.\n"
#define MSGTR_DemuxerDoesntSupportNosound "Tento demuxer zatím nepodporuje -nosound.\n"
#define MSGTR_MemAllocFailed "Alokace paměti selhala.\n"
@ -589,7 +589,7 @@ static char help_text[]=
#define MSGTR_FormatNotRecognized "======= Bohužel, formát tohoto souboru nebyl rozpoznán/není podporován =======\n"\
"==== Pokud je soubor AVI, ASF nebo MPEG proud, kontaktujte prosím autora! ====\n"
#define MSGTR_SettingProcessPriority "Nastavuji prioritu procesu: %s\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] fmtsouboru:%d fourcc:0x%X velikost:%dx%d fps:%5.2f fčas:=%6.4f\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] fmtsouboru:%d fourcc:0x%X velikost:%dx%d fps:%5.3f fčas:=%6.4f\n"
#define MSGTR_CannotInitializeMuxer "Nelze inicializovat muxer."
#define MSGTR_MissingVideoStream "Nebyl nalezen video proud.\n"
#define MSGTR_MissingAudioStream "Nebyl nalezen audio proud -> bez zvuku.\n"

4
help/help_mp-de.h
View File

@ -412,7 +412,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "Konfigurationsdatei-Fehler"
#define MSGTR_ErrorParsingCommandLine "Fehler beim Parsen der Kommandozeile"
#define MSGTR_VideoStreamRequired "Videostream zwingend notwendig!\n"
#define MSGTR_ForcingInputFPS "Input-Framerate wird als statt dessen als %5.2f interpretiert.\n"
#define MSGTR_ForcingInputFPS "Input-Framerate wird als statt dessen als %5.3f interpretiert.\n"
#define MSGTR_RawvideoDoesNotSupportAudio "Ausgabedateiformat RAWVIDEO unterstützt kein Audio - Audio wird deaktiviert.\n"
#define MSGTR_DemuxerDoesntSupportNosound "Dieser Demuxer unterstützt -nosound noch nicht.\n"
#define MSGTR_MemAllocFailed "Speicherreservierung fehlgeschlagen."
@ -612,7 +612,7 @@ static char help_text[]=
"============== Sollte dies ein AVI, ASF oder MPEG Stream sein, ===============\n"\
"====================== dann kontaktiere bitte den Autor. =====================\n"
#define MSGTR_SettingProcessPriority "Setze Prozesspriorität: %s\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] Dateiformat:%d fourcc:0x%X Größe:%dx%d fps:%5.2f ftime:=%6.4f\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] Dateiformat:%d fourcc:0x%X Größe:%dx%d fps:%5.3f ftime:=%6.4f\n"
#define MSGTR_CannotInitializeMuxer "Cannot initialize muxer."
#define MSGTR_MissingVideoStream "Kein Videostream gefunden.\n"
#define MSGTR_MissingAudioStream "Kein Audiostream gefunden. -> kein Ton.\n"

4
help/help_mp-en.h
View File

@ -411,7 +411,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "config file error"
#define MSGTR_ErrorParsingCommandLine "error parsing command line"
#define MSGTR_VideoStreamRequired "Video stream is mandatory!\n"
#define MSGTR_ForcingInputFPS "Input fps will be interpreted as %5.2f instead.\n"
#define MSGTR_ForcingInputFPS "Input fps will be interpreted as %5.3f instead.\n"
#define MSGTR_RawvideoDoesNotSupportAudio "Output file format RAWVIDEO does not support audio - disabling audio.\n"
#define MSGTR_DemuxerDoesntSupportNosound "This demuxer doesn't support -nosound yet.\n"
#define MSGTR_MemAllocFailed "Memory allocation failed.\n"
@ -604,7 +604,7 @@ static char help_text[]=
#define MSGTR_FormatNotRecognized "============ Sorry, this file format is not recognized/supported =============\n"\
"=== If this file is an AVI, ASF or MPEG stream, please contact the author! ===\n"
#define MSGTR_SettingProcessPriority "Setting process priority: %s\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.3f ftime:=%6.4f\n"
#define MSGTR_CannotInitializeMuxer "Cannot initialize muxer."
#define MSGTR_MissingVideoStream "No video stream found.\n"
#define MSGTR_MissingAudioStream "No audio stream found -> no sound.\n"

4
help/help_mp-es.h
View File

@ -412,7 +412,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "error en archivo de configuración"
#define MSGTR_ErrorParsingCommandLine "error en parametros de la línea de comando"
#define MSGTR_VideoStreamRequired "¡El flujo de video es obligatorio!\n"
#define MSGTR_ForcingInputFPS "en su lugar el fps de entrada será interpretado como %5.2f\n"
#define MSGTR_ForcingInputFPS "en su lugar el fps de entrada será interpretado como %5.3f\n"
#define MSGTR_RawvideoDoesNotSupportAudio "El formato de archivo de salida RAWVIDEO no soporta audio - desactivando audio\n"
#define MSGTR_DemuxerDoesntSupportNosound "Este demuxer todavía no soporta -nosound.\n"
#define MSGTR_MemAllocFailed "falló la asignación de memoria"
@ -605,7 +605,7 @@ static char help_text[]=
#define MSGTR_InvalidMPEGES "Stream MPEG-ES inválido? Contacta con el autor, podría ser un fallo.\n"
#define MSGTR_FormatNotRecognized "Este formato no está soportado o reconocido. Si este archivo es un AVI, ASF o MPEG, por favor contacte con el autor.\n"
#define MSGTR_SettingProcessPriority "Estableciendo la prioridad del proceso: %s\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X tamaño:%dx%d fps:%5.2f ftime:=%6.4f\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X tamaño:%dx%d fps:%5.3f ftime:=%6.4f\n"
#define MSGTR_CannotInitializeMuxer "No se puede inicializar el muxer."
#define MSGTR_MissingVideoStream "¡No se encontró stream de video!\n"
#define MSGTR_MissingAudioStream "No se encontró el stream de audio, no se reproducirá sonido.\n"

2
help/help_mp-fr.h
View File

@ -393,7 +393,7 @@ static char help_text[]=
#define MSGTR_ConfigfileError "Erreur du fichier de configuration"
#define MSGTR_ErrorParsingCommandLine "Erreur en analysant la ligne de commande"
#define MSGTR_VideoStreamRequired "La présence d'un flux vidéo est obligatoire !\n"
#define MSGTR_ForcingInputFPS "Le fps d'entrée sera plutôt interprété comme %5.2f\n"
#define MSGTR_ForcingInputFPS "Le fps d'entrée sera plutôt interprété comme %5.3f\n"
#define MSGTR_RawvideoDoesNotSupportAudio "Le format de sortie RAWVIDEO ne supporte pas l'audio - audio désactivé\n"
#define MSGTR_DemuxerDoesntSupportNosound "Ce demuxer ne supporte pas encore l'option -nosound.\n"
#define MSGTR_MemAllocFailed "Une allocation mémoire a échoué\n"

4
help/help_mp-hu.h
View File

@ -410,7 +410,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "konfigurációs fájl hibája"
#define MSGTR_ErrorParsingCommandLine "hiba a parancssor értelmezésekor"
#define MSGTR_VideoStreamRequired "Video stream szükséges!\n"
#define MSGTR_ForcingInputFPS "Az input fps inkább %5.2f-ként lesz értelmezve.\n"
#define MSGTR_ForcingInputFPS "Az input fps inkább %5.3f-ként lesz értelmezve.\n"
#define MSGTR_RawvideoDoesNotSupportAudio "A RAWVIDEO kimeneti fájl formátum nem támogatja a hangot - audió letiltva.\n"
#define MSGTR_DemuxerDoesntSupportNosound "Ez a demuxer még nem támogatja a -nosound kapcsolót.\n"
#define MSGTR_MemAllocFailed "Nem sikerült a memóriafoglalás.\n"
@ -603,7 +603,7 @@ static char help_text[]=
#define MSGTR_FormatNotRecognized "========= Sajnos ez a fájlformátum ismeretlen vagy nem támogatott ===========\n"\
"= Ha ez egy AVI, ASF vagy MPEG fájl, lépj kapcsolatba a készítőkkel (hiba)! =\n"
#define MSGTR_SettingProcessPriority "Folyamat priorításának beállítása: %s\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X méret:%dx%d fps:%5.2f ftime:=%6.4f\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X méret:%dx%d fps:%5.3f ftime:=%6.4f\n"
#define MSGTR_CannotInitializeMuxer "A muxer nem inicializálható."
#define MSGTR_MissingVideoStream "Nincs képfolyam!\n"
#define MSGTR_MissingAudioStream "Nincs hangfolyam... -> hang nélkül\n"

2
help/help_mp-it.h
View File

@ -407,7 +407,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "errore file di configurazione"
#define MSGTR_ErrorParsingCommandLine "errore leggendo la riga comando"
#define MSGTR_VideoStreamRequired "Il flusso video è obbligatorio!\n"
#define MSGTR_ForcingInputFPS "i fps saranno interpretati come %5.2f.\n"
#define MSGTR_ForcingInputFPS "i fps saranno interpretati come %5.3f.\n"
#define MSGTR_RawvideoDoesNotSupportAudio "Il formato output RAWVIDEO non supporta l'audio - lo disabilito.\n"
#define MSGTR_DemuxerDoesntSupportNosound "Questo demuxer non supporta ancora -nosound.\n"
#define MSGTR_MemAllocFailed "Allocazione memoria non riuscita.\n"

2
help/help_mp-nl.h
View File

@ -318,7 +318,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "Fout in het configuratie bestand of configuratie bestand ontbreekt"
#define MSGTR_ErrorParsingCommandLine "Fout bij het analyseren van de commandoregel"
#define MSGTR_VideoStreamRequired "Een Video stream is verplicht!\n"
#define MSGTR_ForcingInputFPS "input fps zal geinterpreteerd worden als %5.2f \n"
#define MSGTR_ForcingInputFPS "input fps zal geinterpreteerd worden als %5.3f \n"
#define MSGTR_RawvideoDoesNotSupportAudio "Het output bestandsformaat RAWVIDEO ondersteunt geen audio - geluid \n"
#define MSGTR_DemuxerDoesntSupportNosound "Deze demuxer ondersteunt -nosound nog niet.\n"
#define MSGTR_MemAllocFailed "geheugentoewijzing gefaald"

2
help/help_mp-pl.h
View File

@ -388,7 +388,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "błąd pliku konfiguracyjnego"
#define MSGTR_ErrorParsingCommandLine "błąd w przetwarzaniu wiersza poleceń"
#define MSGTR_VideoStreamRequired "Wymagany jest strumień video!\n"
#define MSGTR_ForcingInputFPS "Wejściowa wartość FPS zostanie zinterpretowana jako %5.2f.\n"
#define MSGTR_ForcingInputFPS "Wejściowa wartość FPS zostanie zinterpretowana jako %5.3f.\n"
#define MSGTR_RawvideoDoesNotSupportAudio "Wyjściowy format RAWVIDEO nie obsługuje dźwięku - wyłączam dźwięk.\n"
#define MSGTR_DemuxerDoesntSupportNosound "Ten demuxer jeszcze nie obsługuje opcji -nosound.\n"
#define MSGTR_MemAllocFailed "Alokacja pamięci nie powiodła się.\n"

4
help/help_mp-ru.h
View File

@ -406,7 +406,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "ошибка в конфигурационном файле"
#define MSGTR_ErrorParsingCommandLine "ошибка анализа командной строки"
#define MSGTR_VideoStreamRequired "Наличие видеопотока обязательно!\n"
#define MSGTR_ForcingInputFPS "входные кадры/сек будут заменены на %5.2f\n"
#define MSGTR_ForcingInputFPS "входные кадры/сек будут заменены на %5.3f\n"
#define MSGTR_RawvideoDoesNotSupportAudio "Выходной формат файла RAWVIDEO не поддерживает аудио - отключаю аудио\n"
#define MSGTR_DemuxerDoesntSupportNosound "Этот демультиплексор пока что не поддерживает -nosound.\n"
#define MSGTR_MemAllocFailed "не могу выделить память"
@ -599,7 +599,7 @@ static char help_text[]=
#define MSGTR_FormatNotRecognized "======= Извините, формат этого файла не распознан/не поддерживается ==========\n"\
"===== Если это AVI, ASF или MPEG поток, пожалуйста свяжитесь с автором! ======\n"
#define MSGTR_SettingProcessPriority "Устанавливаю приоритет процесса: %s\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] формат:%d fourcc:0x%X размер:%dx%d fps:%5.2f ftime:=%6.4f\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] формат:%d fourcc:0x%X размер:%dx%d fps:%5.3f ftime:=%6.4f\n"
#define MSGTR_CannotInitializeMuxer "Невозможно инициализировать мультиплексор."
#define MSGTR_MissingVideoStream "Видеопоток не найден!\n"
#define MSGTR_MissingAudioStream "Аудиопоток не найден -> без звука\n"

2
help/help_mp-sk.h
View File

@ -382,7 +382,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "chyba konfiguračného súboru"
#define MSGTR_ErrorParsingCommandLine "chyba pri spracovávaní príkazového riadku"
#define MSGTR_VideoStreamRequired "Video prúd je povinný!\n"
#define MSGTR_ForcingInputFPS "vstupné fps bude interpretované ako %5.2f\n"
#define MSGTR_ForcingInputFPS "vstupné fps bude interpretované ako %5.3f\n"
#define MSGTR_RawvideoDoesNotSupportAudio "Výstupný formát súboru RAWVIDEO nepodporuje zvuk - vypínam ho\n"
#define MSGTR_DemuxerDoesntSupportNosound "Tento demuxer zatiaľ nepodporuje -nosound.\n"
#define MSGTR_MemAllocFailed "Alokácia pamäte zlyhala\n"

2
help/help_mp-sv.h
View File

@ -327,7 +327,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "konfigurationsfilsfel"
#define MSGTR_ErrorParsingCommandLine "fel vid tolkning av cmdline"
#define MSGTR_VideoStreamRequired "Videoström är obligatoriskt!\n"
#define MSGTR_ForcingInputFPS "'input fps' kommer att bli tolkad som %5.2f istället\n"
#define MSGTR_ForcingInputFPS "'input fps' kommer att bli tolkad som %5.3f istället\n"
#define MSGTR_RawvideoDoesNotSupportAudio "Ut-filformat RAWVIDEO stödjer inte audio - deaktiverar audio\n"
#define MSGTR_DemuxerDoesntSupportNosound "Denna demuxer stödjer inte -nosound ännu.\n"
#define MSGTR_MemAllocFailed "minnesallokering misslyckades"

2
help/help_mp-tr.h
View File

@ -407,7 +407,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "ayar dosyası hatası"
#define MSGTR_ErrorParsingCommandLine "komutsatırı ayrıştırma hatası"
#define MSGTR_VideoStreamRequired "Video yayını(stream) zorunlu!\n"
#define MSGTR_ForcingInputFPS "girdi fps değeri %5.2f olarak yorumlanacak\n"
#define MSGTR_ForcingInputFPS "girdi fps değeri %5.3f olarak yorumlanacak\n"
#define MSGTR_RawvideoDoesNotSupportAudio "Çıktı dosyası RAWVIDEO biçimi sesi desteklemiyor - ses devre dışı bırakılıyor\n"
#define MSGTR_DemuxerDoesntSupportNosound "Ayrıştırıcı -nosound seçeneğini henüz desteklemiyor.\n"
#define MSGTR_MemAllocFailed "Bellek atanamadı\n"

4
help/help_mp-zh_CN.h
View File

@ -405,7 +405,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "配置文件错误"
#define MSGTR_ErrorParsingCommandLine "解析命令行错误"
#define MSGTR_VideoStreamRequired "视频流是必须的!\n"
#define MSGTR_ForcingInputFPS "输入帧率将被替换为 %5.2f。\n"
#define MSGTR_ForcingInputFPS "输入帧率将被替换为 %5.3f。\n"
#define MSGTR_RawvideoDoesNotSupportAudio "RAWVIDEO 输出文件格式不支持音频 - 停用音频。\n"
#define MSGTR_DemuxerDoesntSupportNosound "目前此分路器还不支持 -nosound。\n"
#define MSGTR_MemAllocFailed "内存分配失败。\n"
@ -598,7 +598,7 @@ static char help_text[]=
#define MSGTR_FormatNotRecognized "============= 抱歉, 此文件格式无法辨认或支持 ===============\n"\
"=== 如果此文件是一个 AVI, ASF 或 MPEG 流, 请联系作者! ===\n"
#define MSGTR_SettingProcessPriority "设置进程优先级: %s\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] 文件格式:%d fourcc:0x%X 大小:%dx%d 帧速:%5.2f 帧时间:=%6.4f\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] 文件格式:%d fourcc:0x%X 大小:%dx%d 帧速:%5.3f 帧时间:=%6.4f\n"
#define MSGTR_CannotInitializeMuxer "不能初始化muxer。"
#define MSGTR_MissingVideoStream "未找到视频流。\n"
#define MSGTR_MissingAudioStream "未找到音频流... -> 没声音。\n"

4
help/help_mp-zh_TW.h
View File

@ -389,7 +389,7 @@ static char help_text[]=
#define MSGTR_ConfigFileError "配置文件錯誤"
#define MSGTR_ErrorParsingCommandLine "解析命令行錯誤"
#define MSGTR_VideoStreamRequired "視頻流是必須的!\n"
#define MSGTR_ForcingInputFPS "輸入幀率將被替換為 %5.2f。\n"
#define MSGTR_ForcingInputFPS "輸入幀率將被替換為 %5.3f。\n"
#define MSGTR_RawvideoDoesNotSupportAudio "RAWVIDEO 輸出文件格式不支持音頻 - 停用音頻。\n"
#define MSGTR_DemuxerDoesntSupportNosound "目前此分路器還不支持 -nosound。\n"
#define MSGTR_MemAllocFailed "内存分配失敗。\n"
@ -582,7 +582,7 @@ static char help_text[]=
#define MSGTR_FormatNotRecognized "============= 抱歉, 此文件格式無法辨認或支持 ===============\n"\
"=== 如果此文件是一個 AVI, ASF 或 MPEG 流, 請聯係作者! ===\n"
#define MSGTR_SettingProcessPriority "設置進程優先級: %s\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] 文件格式:%d fourcc:0x%X 大小:%dx%d 幀速:%5.2f 幀時間:=%6.4f\n"
#define MSGTR_FilefmtFourccSizeFpsFtime "[V] 文件格式:%d fourcc:0x%X 大小:%dx%d 幀速:%5.3f 幀時間:=%6.4f\n"
#define MSGTR_CannotInitializeMuxer "不能初始化muxer。"
#define MSGTR_MissingVideoStream "未找到視頻流。\n"
#define MSGTR_MissingAudioStream "未找到音頻流... -> 没聲音。\n"

14
libdvdcss/Makefile
View File

@ -1,14 +0,0 @@
include ../config.mak
LIBNAME_COMMON = libdvdcss.a
SRCS_COMMON = css.c \
device.c \
error.c \
ioctl.c \
libdvdcss.c \
#bsdi_ioctl \
CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\"
include ../mpcommon.mak

50
libfaad2/Makefile
View File

@ -1,50 +0,0 @@
include ../config.mak
LIBNAME_COMMON = libfaad2.a
SRCS_COMMON = bits.c \
cfft.c \
common.c \
decoder.c \
drc.c \
drm_dec.c \
error.c \
filtbank.c \
hcr.c \
huffman.c \
ic_predict.c \
is.c \
lt_predict.c \
mdct.c \
mp4.c \
ms.c \
output.c \
pns.c \
ps_dec.c \
ps_syntax.c \
pulse.c \
rvlc.c \
sbr_dct.c \
sbr_dec.c \
sbr_e_nf.c \
sbr_fbt.c \
sbr_hfadj.c \
sbr_hfgen.c \
sbr_huff.c \
sbr_qmf.c \
sbr_syntax.c \
sbr_tf_grid.c \
specrec.c \
ssr.c \
ssr_fb.c \
ssr_ipqf.c \
syntax.c \
tns.c \
CFLAGS = -D_GNU_SOURCE
# The FIXED_POINT implementation of FAAD2 improves performance
# on some platforms, especially for SBR files.
CFLAGS-$(FAAD_FIXED) += -DFIXED_POINT
include ../mpcommon.mak

153
libmpcodecs/Makefile
View File

@ -1,153 +0,0 @@
include ../config.mak
LIBNAME_COMMON = libmpcodecs.a
LIBNAME_MENCODER = libmpencoders.a
SRCS_COMMON = native/nuppelvideo.c \
native/rtjpegn.c \
native/xa_gsm.c \
img_format.c \
mp_image.c \
dec_audio.c \
ad.c \
ad_alaw.c \
ad_dk3adpcm.c \
ad_dvdpcm.c \
ad_hwac3.c \
ad_hwmpa.c \
ad_imaadpcm.c \
ad_msadpcm.c \
ad_msgsm.c \
ad_pcm.c \
dec_video.c \
vd.c \
vd_hmblck.c \
vd_lzo.c \
vd_mpegpes.c \
vd_mtga.c \
vd_null.c \
vd_nuv.c \
vd_raw.c \
vd_sgi.c \
vf.c \
pullup.c \
vf_1bpp.c \
vf_2xsai.c \
vf_blackframe.c \
vf_boxblur.c \
vf_crop.c \
vf_cropdetect.c \
vf_decimate.c \
vf_delogo.c \
vf_denoise3d.c \
vf_detc.c \
vf_dint.c \
vf_divtc.c \
vf_down3dright.c \
vf_dsize.c \
vf_dvbscale.c \
vf_eq2.c \
vf_eq.c \
vf_expand.c \
vf_field.c \
vf_fil.c \
vf_filmdint.c \
vf_flip.c \
vf_format.c \
vf_framestep.c \
vf_halfpack.c \
vf_harddup.c \
vf_hqdn3d.c \
vf_hue.c \
vf_il.c \
vf_ilpack.c \
vf_ivtc.c \
vf_kerndeint.c \
vf_mirror.c \
vf_noformat.c \
vf_noise.c \
vf_palette.c \
vf_perspective.c \
vf_phase.c \
vf_pp7.c \
vf_pullup.c \
vf_rectangle.c \
vf_remove_logo.c \
vf_rgb2bgr.c \
vf_rgbtest.c \
vf_rotate.c \
vf_sab.c \
vf_scale.c \
vf_smartblur.c \
vf_softpulldown.c \
vf_softskip.c \
vf_swapuv.c \
vf_telecine.c \
vf_test.c \
vf_tfields.c \
vf_tile.c \
vf_tinterlace.c \
vf_unsharp.c \
vf_vo.c \
vf_yadif.c \
vf_yuvcsp.c \
vf_yuy2.c \
vf_yvu9.c \
vf_ow.c \
# These filters use private headers and do not work with shared libavcodec.
SRCS_COMMON-$(LIBAVCODEC_A) += vf_fspp.c \
vf_geq.c \
vf_mcdeint.c \
vf_qp.c \
vf_spp.c \
vf_uspp.c \
SRCS_COMMON-$(LIBASS) += vf_ass.c
SRCS_COMMON-$(FAAD) += ad_faad.c
SRCS_COMMON-$(HAVE_POSIX_SELECT) += vf_bmovl.c
SRCS_COMMON-$(JPEG) += vd_ijpg.c
SRCS_COMMON-$(LIBA52) += ad_liba52.c
SRCS_COMMON-$(LIBAVCODEC) += ad_ffmpeg.c vd_ffmpeg.c vf_lavc.c vf_lavcdeint.c vf_screenshot.c
SRCS_COMMON-$(LIBDCA) += ad_libdca.c
SRCS_COMMON-$(LIBDV) += ad_libdv.c vd_libdv.c
SRCS_COMMON-$(LIBMAD) += ad_libmad.c
SRCS_COMMON-$(LIBMPEG2) += vd_libmpeg2.c
SRCS_COMMON-$(LIBPOSTPROC) += vf_pp.c
SRCS_COMMON-$(LIBTHEORA) += vd_theora.c
SRCS_COMMON-$(LIBVORBIS) += ad_libvorbis.c
SRCS_COMMON-$(MP3LIB) += ad_mp3lib.c
SRCS_COMMON-$(MUSEPACK) += ad_mpc.c
SRCS_COMMON-$(PNG) += vd_mpng.c
SRCS_COMMON-$(QTX_CODECS) += ad_qtaudio.c vd_qtvideo.c
SRCS_COMMON-$(REAL_CODECS) += ad_realaud.c vd_realvid.c
SRCS_COMMON-$(SPEEX) += ad_speex.c
SRCS_COMMON-$(WIN32DLL) += ad_acm.c ad_dmo.c ad_dshow.c ad_twin.c \
vd_dmo.c vd_dshow.c vd_vfw.c vd_vfwex.c
SRCS_COMMON-$(XANIM_CODECS) += vd_xanim.c
SRCS_COMMON-$(XVID4) += vd_xvid4.c
SRCS_COMMON-$(ZORAN) += vd_zrmjpeg.c vf_zrmjpeg.c
SRCS_MENCODER = ae.c \
ae_pcm.c \
ve.c \
ve_raw.c \
SRCS_MENCODER-$(LIBAVCODEC) += ae_lavc.c ve_lavc.c
SRCS_MENCODER-$(LIBDV) += ve_libdv.c
SRCS_MENCODER-$(LIBLZO) += ve_nuv.c
SRCS_MENCODER-$(QTX_CODECS) += ve_qtvideo.c
SRCS_MENCODER-$(WIN32DLL) += ve_vfw.c
SRCS_MENCODER-$(X264) += ve_x264.c
SRCS_MENCODER-$(XVID4) += ve_xvid4.c
SRCS_MENCODER-$(FAAC) += ae_faac.c
SRCS_MENCODER-$(TOOLAME) += ae_toolame.c
SRCS_MENCODER-$(TWOLAME) += ae_twolame.c
SRCS_MENCODER-$(MP3LAME) += ae_lame.c
include ../mpcommon.mak
clean::
rm -f native/*.o native/*.a native/*~

73
libmpdemux/Makefile
View File

@ -1,73 +0,0 @@
include ../config.mak
LIBNAME_COMMON = libmpdemux.a
LIBNAME_MENCODER = libmpmux.a
SRCS_COMMON = aac_hdr.c \
asfheader.c \
aviheader.c \
aviprint.c \
demuxer.c \
demux_aac.c \
demux_asf.c \
demux_audio.c \
demux_avi.c \
demux_demuxers.c \
demux_film.c \
demux_fli.c \
demux_lmlm4.c \
demux_mf.c \
demux_mkv.c ebml.c \
demux_mov.c \
demux_mpg.c \
demux_nsv.c \
demux_nuv.c \
demux_pva.c \
demux_rawaudio.c \
demux_rawvideo.c \
demux_realaud.c \
demux_real.c \
demux_roq.c \
demux_smjpeg.c \
demux_ts.c \
demux_ty.c \
demux_ty_osd.c \
demux_viv.c \
demux_vqf.c \
demux_y4m.c \
extension.c \
mf.c \
mp3_hdr.c \
mp_taglists.c \
mpeg_hdr.c \
mpeg_packetizer.c \
parse_es.c \
parse_mp4.c \
video.c \
yuv4mpeg.c \
yuv4mpeg_ratio.c \
SRCS_COMMON-$(GIF) += demux_gif.c
SRCS_COMMON-$(LIBAVFORMAT) += demux_lavf.c
SRCS_COMMON-$(LIBDV) += demux_rawdv.c
SRCS_COMMON-$(LIBNEMESI) += demux_nemesi.c
SRCS_COMMON-$(LIBNUT) += demux_nut.c
SRCS_COMMON-$(LIBVORBIS) += demux_ogg.c
SRCS_COMMON-$(MUSEPACK) += demux_mpc.c
SRCS_COMMON-$(STREAMING_LIVE555) += demux_rtp.cpp demux_rtp_codec.cpp
SRCS_COMMON-$(WIN32DLL) += demux_avs.c
SRCS_COMMON-$(XMMS_PLUGINS) += demux_xmms.c
SRCS_MENCODER = muxer.c \
muxer_avi.c \
muxer_mpeg.c \
muxer_rawaudio.c \
muxer_rawvideo.c \
SRCS_MENCODER-$(LIBAVFORMAT) += muxer_lavf.c
include ../mpcommon.mak
demux_lavf.o mp_taglists.o .depend: CFLAGS += -I../libavcodec
.depend: CFLAGS += $(EXTRAXX_INC)

2
libmpdemux/demux_rtp_codec.cpp
View File

@ -6,7 +6,7 @@ extern "C" {
#include <limits.h>
#include <math.h>
#include "stheader.h"
#include "base64.h"
#include "libavutil/base64.h"
}
#ifdef USE_LIBAVCODEC

12
mp3lib/Makefile
View File

@ -5,17 +5,15 @@ LIBNAME_COMMON = mp3lib.a
SRCS_COMMON = sr1.c
SRCS_COMMON-$(HAVE_MMX) += decode_mmx.c
SRCS_COMMON-$(HAVE_SSE) += dct64_sse.c
ifeq ($(ARCH_X86_32),yes)
SRCS_COMMON += decode_i586.c
SRCS_COMMON-$(HAVE_MMX) += dct64_mmx.c
SRCS_COMMON-$(HAVE_3DNOW) += dct36_3dnow.c dct64_3dnow.c
SRCS_COMMON-$(HAVE_3DNOWEX) += dct36_k7.c dct64_k7.c
endif
SRCS_COMMON-$(ARCH_X86_32) += decode_i586.c
SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_MMX) += dct64_mmx.c
SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOW) += dct36_3dnow.c dct64_3dnow.c
SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOWEX) += dct36_k7.c dct64_k7.c
SRCS_COMMON-$(HAVE_ALTIVEC) += dct64_altivec.c
include ../mpcommon.mak
decode_i586.o: CFLAGS += -fomit-frame-pointer
%: %.c $(LIBNAME_COMMON) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../osdep/getch2.o
%: %.c $(LIBNAME_COMMON) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH)
$(CC) $(CFLAGS) -o $@ $^ -ltermcap -lm

5
mp3lib/test.c
View File

@ -1,8 +1,6 @@
#define DUMP_PCM
// gcc test.c -I.. -L. -lMP3 -lm -o test1 -O4
#include <stdio.h>
#include <stdlib.h>
@ -12,7 +10,6 @@
#include "config.h"
#include "mp3lib/mp3.h"
#include "cpudetect.h"
extern CpuCaps gCpuCaps;
static inline unsigned int GetTimer(){
struct timeval tv;
@ -71,5 +68,5 @@ int main(int argc,char* argv[]){
printf("CPU usage at normal playback: %5.2f %%\n",time1*0.0001f/length);
fclose(mp3file);
return 0;
}

7
mp3lib/test2.c
View File

@ -1,8 +1,6 @@
//gcc test2.c -O2 -I.. -L. ../libvo/aclib.c -lMP3 -lm -o test2
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#include <sys/ioctl.h>
@ -26,7 +24,6 @@ static unsigned char buffer[BUFFLEN];
int main(int argc,char* argv[]){
int len;
int total=0;
float length;
int r;
int audio_fd;
@ -68,5 +65,5 @@ int main(int argc,char* argv[]){
}
fclose(mp3file);
return 0;
}

4
mpcommon.mak
View File

@ -1,4 +1,5 @@
SRCS_COMMON += $(SRCS_COMMON-yes)
SRCS_COMMON += $(SRCS_COMMON-yes-yes)
SRCS_MPLAYER += $(SRCS_MPLAYER-yes)
SRCS_MENCODER += $(SRCS_MENCODER-yes)
@ -33,6 +34,9 @@ distclean:: clean
%.d: %.c
$(MPDEPEND_CMD) > $@
%.d: %.cpp
$(MPDEPEND_CMD_CXX) > $@
%.ho: %.h
$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<

2
mplayer.c
View File

@ -3396,7 +3396,7 @@ if(mpctx->sh_video){
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotReadVideoProperties);
mpctx->sh_video=mpctx->d_video->sh=NULL;
} else {
mp_msg(MSGT_CPLAYER,MSGL_V,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n",
mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_FilefmtFourccSizeFpsFtime,
mpctx->demuxer->file_format,mpctx->sh_video->format, mpctx->sh_video->disp_w,mpctx->sh_video->disp_h,
mpctx->sh_video->fps,mpctx->sh_video->frametime
);

73
stream/Makefile
View File

@ -1,73 +0,0 @@
include ../config.mak
LIBNAME_COMMON = stream.a
SRCS_COMMON = open.c \
stream.c \
stream_cue.c \
stream_file.c \
stream_mf.c \
stream_null.c \
url.c \
SRCS_COMMON-$(CDDA) += stream_cdda.c cdinfo.c
SRCS_COMMON-$(CDDB) += stream_cddb.c
SRCS_COMMON-$(DVBIN) += dvb_tune.c stream_dvb.c
SRCS_COMMON-$(DVDNAV) += stream_dvdnav.c
SRCS_COMMON-$(DVDREAD) += stream_dvd.c stream_dvd_common.c
SRCS_COMMON-$(FTP) += stream_ftp.c
SRCS_COMMON-$(LIBSMBCLIENT) += stream_smb.c
SRCS_COMMON-$(MPLAYER_NETWORK) += stream_netstream.c \
asf_mmst_streaming.c \
asf_streaming.c \
cookies.c \
http.c \
network.c \
pnm.c \
rtp.c \
udp.c \
tcp.c \
stream_rtp.c \
stream_udp.c \
realrtsp/asmrp.c \
realrtsp/real.c \
realrtsp/rmff.c \
realrtsp/sdpplin.c \
realrtsp/xbuffer.c \
SRCS_COMMON-$(NATIVE_RTSP) += stream_rtsp.c \
freesdp/common.c \
freesdp/errorlist.c \
freesdp/parser.c \
librtsp/rtsp.c \
librtsp/rtsp_rtp.c \
librtsp/rtsp_session.c \
SRCS_COMMON-$(LIBNEMESI) += stream_nemesi.c
SRCS_COMMON-$(PVR) += stream_pvr.c
SRCS_COMMON-$(RADIO) += stream_radio.c
SRCS_COMMON-$(RADIO_CAPTURE) += audio_in.c
SRCS_COMMON-$(STREAM_CACHE) += cache2.c
SRCS_COMMON-$(STREAMING_LIVE555) += stream_livedotcom.c
SRCS_COMMON-$(TV) += stream_tv.c tv.c frequencies.c tvi_dummy.c
SRCS_COMMON-$(TV_BSDBT848) += tvi_bsdbt848.c
SRCS_COMMON-$(TV_DSHOW) += tvi_dshow.c
SRCS_COMMON-$(TV_TELETEXT) += tvi_vbi.c
SRCS_COMMON-$(TV_V4L1) += tvi_v4l.c audio_in.c
SRCS_COMMON-$(TV_V4L2) += tvi_v4l2.c audio_in.c
SRCS_COMMON-$(VCD) += stream_vcd.c
SRCS_COMMON-$(VSTREAM) += stream_vstream.c
ifeq ($(AUDIO_INPUT),yes)
SRCS_COMMON-$(ALSA1X) += ai_alsa1x.c
SRCS_COMMON-$(ALSA9) += ai_alsa.c
SRCS_COMMON-$(OSS) += ai_oss.c
endif
include ../mpcommon.mak
clean::
rm -f realrtsp/*.o realrtsp/*.a realrtsp/*~ \
librtsp/*.o librtsp/*.a librtsp/*~ \
freesdp/*.o freesdp/*.a freesdp/*~