summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile59
1 files changed, 32 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index 9e565c829d..7dc01f7a3d 100644
--- a/Makefile
+++ b/Makefile
@@ -28,16 +28,15 @@ SOURCES_AUDIO_INPUT-$(OSS) += stream/ai_oss.c
SOURCES-$(AUDIO_INPUT) += $(SOURCES_AUDIO_INPUT-yes)
SOURCES-$(CDDA) += stream/stream_cdda.c \
stream/cdinfo.c
-SOURCES-$(CDDB) += stream/stream_cddb.c
SOURCES-$(DVBIN) += stream/dvb_tune.c \
stream/stream_dvb.c
SOURCES-$(DVDREAD) += stream/stream_dvd.c \
stream/stream_dvd_common.c
-SOURCES-$(FTP) += stream/stream_ftp.c
-SOURCES-$(HAVE_SYS_MMAN_H) += audio/filter/af_export.c osdep/mmap_anon.c
+SOURCES-$(HAVE_SYS_MMAN_H) += audio/filter/af_export.c
SOURCES-$(LADSPA) += audio/filter/af_ladspa.c
-SOURCES-$(LIBASS) += sub/ass_mp.c sub/sd_ass.c
+SOURCES-$(LIBASS) += sub/ass_mp.c sub/sd_ass.c \
+ demux/demux_libass.c
SOURCES-$(LIBBLURAY) += stream/stream_bluray.c
SOURCES-$(LIBBS2B) += audio/filter/af_bs2b.c
@@ -45,37 +44,28 @@ SOURCES-$(LIBBS2B) += audio/filter/af_bs2b.c
SOURCES-$(LIBPOSTPROC) += video/filter/vf_pp.c
SOURCES-$(LIBSMBCLIENT) += stream/stream_smb.c
-SOURCES-$(MACOSX_FINDER) += osdep/macosx_finder_args.m
SOURCES-$(MACOSX_BUNDLE) += osdep/macosx_bundle.m
-SOURCES-$(COCOA) += video/out/osx_common.m \
- video/out/cocoa_common.m
+SOURCES-$(COCOA) += video/out/cocoa_common.m \
+ osdep/macosx_application.m \
+ osdep/macosx_events.m \
+ osdep/ar/HIDRemote.m
SOURCES-$(MNG) += demux/demux_mng.c
SOURCES-$(MPG123) += audio/decode/ad_mpg123.c
SOURCES-$(NEED_GETTIMEOFDAY) += osdep/gettimeofday.c
SOURCES-$(NEED_GLOB) += osdep/glob-win.c
-SOURCES-$(NEED_SHMEM) += osdep/shmem.c
-SOURCES-$(NETWORKING) += stream/asf_mmst_streaming.c \
- stream/asf_streaming.c \
- stream/cookies.c \
- stream/http.c \
- stream/network.c \
- stream/udp.c \
- stream/tcp.c \
- stream/stream_udp.c \
SOURCES-$(PRIORITY) += osdep/priority.c
SOURCES-$(PVR) += stream/stream_pvr.c
SOURCES-$(RADIO) += stream/stream_radio.c
SOURCES-$(RADIO_CAPTURE) += stream/audio_in.c
-SOURCES-$(STREAM_CACHE) += stream/cache2.c
+SOURCES-$(STREAM_CACHE) += stream/cache.c
SOURCES-$(TV) += stream/stream_tv.c stream/tv.c \
stream/frequencies.c stream/tvi_dummy.c
SOURCES-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c
SOURCES-$(VCD) += stream/stream_vcd.c
-SOURCES-$(VSTREAM) += stream/stream_vstream.c
SOURCES-$(DUMMY_OSD) += sub/osd_dummy.c
SOURCES-$(LIBASS_OSD) += sub/osd_libass.c
@@ -88,9 +78,10 @@ SOURCES-$(COREVIDEO) += video/out/vo_corevideo.m
SOURCES-$(DIRECT3D) += video/out/vo_direct3d.c \
video/out/w32_common.c
SOURCES-$(DSOUND) += audio/out/ao_dsound.c
+SOURCES-$(WASAPI0) += audio/out/ao_wasapi0.c
SOURCES-$(GL) += video/out/gl_common.c video/out/gl_osd.c \
video/out/vo_opengl.c video/out/gl_lcms.c \
- video/out/gl_video.c \
+ video/out/gl_video.c video/out/dither.c \
video/out/vo_opengl_old.c \
video/out/pnm_loader.c
@@ -105,7 +96,8 @@ SOURCES-$(GL_WAYLAND) += video/out/wayland_common.c \
SOURCES-$(JACK) += audio/out/ao_jack.c
SOURCES-$(JOYSTICK) += core/input/joystick.c
-SOURCES-$(LIBQUVI) += core/quvi.c
+SOURCES-$(LIBQUVI) += core/resolve_quvi.c
+SOURCES-$(LIBQUVI9) += core/resolve_quvi9.c
SOURCES-$(LIRC) += core/input/lirc.c
SOURCES-$(OPENAL) += audio/out/ao_openal.c
SOURCES-$(OSS) += audio/out/ao_oss.c
@@ -118,12 +110,17 @@ SOURCES-$(X11) += video/out/vo_x11.c video/out/x11_common.c
SOURCES-$(XV) += video/out/vo_xv.c
SOURCES-$(VF_LAVFI) += video/filter/vf_lavfi.c
+SOURCES-$(AF_LAVFI) += audio/filter/af_lavfi.c
ifeq ($(HAVE_AVUTIL_REFCOUNTING),no)
SOURCES-yes += video/decode/lavc_dr1.c
endif
SOURCES = talloc.c \
+ audio/audio.c \
+ audio/chmap.c \
+ audio/chmap_sel.c \
+ audio/fmt-conversion.c \
audio/format.c \
audio/mixer.c \
audio/reorder_ch.c \
@@ -138,6 +135,7 @@ SOURCES = talloc.c \
audio/filter/af_dummy.c \
audio/filter/af_equalizer.c \
audio/filter/af_extrastereo.c \
+ audio/filter/af_force.c \
audio/filter/af_format.c \
audio/filter/af_hrtf.c \
audio/filter/af_karaoke.c \
@@ -162,18 +160,19 @@ SOURCES = talloc.c \
core/av_log.c \
core/av_opts.c \
core/bstr.c \
+ core/charset_conv.c \
core/codecs.c \
core/command.c \
core/cpudetect.c \
- core/defaultopts.c \
core/m_config.c \
core/m_option.c \
core/m_property.c \
core/m_struct.c \
core/mp_common.c \
- core/mp_fifo.c \
core/mp_msg.c \
+ core/mp_ring.c \
core/mplayer.c \
+ core/options.c \
core/parser-cfg.c \
core/parser-mpcmd.c \
core/path.c \
@@ -199,6 +198,7 @@ SOURCES = talloc.c \
demux/demux_mf.c \
demux/demux_mkv.c \
demux/demux_mpg.c \
+ demux/demux_subreader.c \
demux/demux_ts.c \
demux/mp3_hdr.c \
demux/parse_es.c \
@@ -209,25 +209,30 @@ SOURCES = talloc.c \
demux/extension.c \
demux/mf.c \
demux/video.c \
- osdep/numcores.c \
osdep/io.c \
+ osdep/numcores.c \
+ osdep/timer.c \
+ stream/cookies.c \
stream/stream.c \
stream/stream_avdevice.c \
stream/stream_file.c \
stream/stream_lavf.c \
+ stream/stream_memory.c \
stream/stream_mf.c \
stream/stream_null.c \
- stream/url.c \
sub/dec_sub.c \
sub/draw_bmp.c \
- sub/find_sub.c \
sub/find_subfiles.c \
sub/img_convert.c \
sub/sd_lavc.c \
+ sub/sd_lavc_conv.c \
+ sub/sd_lavf_srt.c \
+ sub/sd_microdvd.c \
+ sub/sd_movtext.c \
+ sub/sd_spu.c \
+ sub/sd_srt.c \
sub/spudec.c \
sub/sub.c \
- sub/subassconvert.c \
- sub/subreader.c \
video/csputils.c \
video/fmt-conversion.c \
video/image_writer.c \