summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-09 01:06:43 +0100
committerwm4 <wm4@nowhere>2012-11-12 20:08:18 +0100
commit4873b32c5959c988af1769529ff72e3fd62fba82 (patch)
treee18fbd7eef54de6071969689aa5c31d6ea1f0963
parentd4bdd0473d6f43132257c9fb3848d829755167a3 (diff)
downloadmpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.bz2
mpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.xz
Rename directories, move files (step 2 of 2)
Finish renaming directories and moving files. Adjust all include statements to make the previous commit compile. The two commits are separate, because git is bad at tracking renames and content changes at the same time. Also take this as an opportunity to remove the separation between "common" and "mplayer" sources in the Makefile. ("common" used to be shared between mplayer and mencoder.)
-rw-r--r--.gitignore14
-rw-r--r--DOCS/tech-overview.txt40
-rw-r--r--Makefile602
-rw-r--r--audio/decode/ad.c4
-rw-r--r--audio/decode/ad.h4
-rw-r--r--audio/decode/ad_dvdpcm.c2
-rw-r--r--audio/decode/ad_internal.h8
-rw-r--r--audio/decode/ad_lavc.c8
-rw-r--r--audio/decode/ad_pcm.c4
-rw-r--r--audio/decode/ad_spdif.c2
-rw-r--r--audio/decode/dec_audio.c14
-rw-r--r--audio/decode/dec_audio.h2
-rw-r--r--audio/filter/af.h7
-rw-r--r--audio/filter/af_bs2b.c2
-rw-r--r--audio/filter/af_export.c2
-rw-r--r--audio/filter/af_format.c2
-rw-r--r--audio/filter/af_lavcac3enc.c2
-rw-r--r--audio/filter/af_scaletempo.c2
-rw-r--r--audio/format.c2
-rw-r--r--audio/format.h2
-rw-r--r--audio/mixer.c6
-rw-r--r--audio/mixer.h3
-rw-r--r--audio/out/ao.c4
-rw-r--r--audio/out/ao.h2
-rw-r--r--audio/out/ao_alsa.c10
-rw-r--r--audio/out/ao_coreaudio.c8
-rw-r--r--audio/out/ao_dsound.c8
-rw-r--r--audio/out/ao_jack.c8
-rw-r--r--audio/out/ao_lavc.c15
-rw-r--r--audio/out/ao_null.c4
-rw-r--r--audio/out/ao_openal.c8
-rw-r--r--audio/out/ao_oss.c8
-rw-r--r--audio/out/ao_pcm.c10
-rw-r--r--audio/out/ao_portaudio.c8
-rw-r--r--audio/out/ao_pulse.c8
-rw-r--r--audio/out/ao_rsound.c6
-rw-r--r--audio/out/audio_out_internal.h2
-rw-r--r--audio/reorder_ch.c4
-rwxr-xr-xconfigure8
-rw-r--r--core/asxparser.c4
-rw-r--r--core/av_log.c2
-rw-r--r--core/bstr.c2
-rw-r--r--core/cfg-mplayer.h12
-rw-r--r--core/codec-cfg.c8
-rw-r--r--core/command.c31
-rw-r--r--core/cpudetect.c6
-rw-r--r--core/cpudetect.h2
-rw-r--r--core/defaultopts.c4
-rw-r--r--core/encode_lavc.c8
-rw-r--r--core/encode_lavc.h2
-rw-r--r--core/input/appleir.c2
-rw-r--r--core/input/input.c16
-rw-r--r--core/input/input.h6
-rw-r--r--core/input/joystick.c2
-rw-r--r--core/input/lirc.c2
-rw-r--r--core/m_config.c4
-rw-r--r--core/m_config.h2
-rw-r--r--core/m_option.c10
-rw-r--r--core/m_option.h2
-rw-r--r--core/m_property.c6
-rw-r--r--core/m_struct.c6
-rw-r--r--core/m_struct.h2
-rw-r--r--core/mp_common.c2
-rw-r--r--core/mp_core.h6
-rw-r--r--core/mp_fifo.c2
-rw-r--r--core/mp_fifo.h2
-rw-r--r--core/mp_msg.c2
-rw-r--r--core/mp_msg.h2
-rw-r--r--core/mplayer.c74
-rw-r--r--core/mplayer.h2
-rw-r--r--core/parser-cfg.c4
-rw-r--r--core/parser-mpcmd.c4
-rw-r--r--core/path.c4
-rw-r--r--core/path.h2
-rw-r--r--core/playlist.c4
-rw-r--r--core/playlist.h2
-rw-r--r--core/playlist_parser.c6
-rw-r--r--core/quvi.c4
-rw-r--r--core/screenshot.c24
-rw-r--r--core/subopt-helper.c4
-rw-r--r--core/timeline/tl_cue.c12
-rw-r--r--core/timeline/tl_edl.c12
-rw-r--r--core/timeline/tl_matroska.c12
-rw-r--r--demux/asf.h2
-rw-r--r--demux/asfguid.h2
-rw-r--r--demux/asfheader.c4
-rw-r--r--demux/asfheader.h2
-rw-r--r--demux/aviheader.c4
-rw-r--r--demux/aviheader.h2
-rw-r--r--demux/aviprint.c2
-rw-r--r--demux/demux.c9
-rw-r--r--demux/demux.h4
-rw-r--r--demux/demux_asf.c6
-rw-r--r--demux/demux_avi.c4
-rw-r--r--demux/demux_cue.c4
-rw-r--r--demux/demux_edl.c2
-rw-r--r--demux/demux_gif.c7
-rw-r--r--demux/demux_lavf.c14
-rw-r--r--demux/demux_mf.c4
-rw-r--r--demux/demux_mkv.c8
-rw-r--r--demux/demux_mng.c6
-rw-r--r--demux/demux_mpg.c8
-rw-r--r--demux/demux_rawaudio.c6
-rw-r--r--demux/demux_rawvideo.c6
-rw-r--r--demux/demux_ts.c8
-rw-r--r--demux/ebml.c4
-rw-r--r--demux/ebml.h2
-rw-r--r--demux/extension.c4
-rw-r--r--demux/mf.c4
-rw-r--r--demux/mp3_hdr.c2
-rw-r--r--demux/mpeg_hdr.c2
-rw-r--r--demux/parse_es.c4
-rw-r--r--demux/parse_es.h2
-rw-r--r--demux/video.c4
-rw-r--r--osdep/cocoa_events.h2
-rw-r--r--osdep/cocoa_events.m2
-rw-r--r--osdep/getch2-win.c6
-rw-r--r--osdep/getch2.c6
-rw-r--r--osdep/macosx_finder_args.h2
-rw-r--r--osdep/macosx_finder_args.m2
-rw-r--r--osdep/priority.c2
-rw-r--r--osdep/shmem.c2
-rw-r--r--osdep/timer-darwin.c2
-rw-r--r--stream/ai_alsa1x.c2
-rw-r--r--stream/ai_oss.c2
-rw-r--r--stream/asf_mmst_streaming.c6
-rw-r--r--stream/asf_streaming.c10
-rw-r--r--stream/audio_in.c2
-rw-r--r--stream/cache2.c4
-rw-r--r--stream/cdinfo.c2
-rw-r--r--stream/cookies.c2
-rw-r--r--stream/dvb_tune.c2
-rw-r--r--stream/http.c4
-rw-r--r--stream/network.c9
-rw-r--r--stream/stream.c8
-rw-r--r--stream/stream.h4
-rw-r--r--stream/stream_bluray.c8
-rw-r--r--stream/stream_cdda.c10
-rw-r--r--stream/stream_cddb.c8
-rw-r--r--stream/stream_dvb.c8
-rw-r--r--stream/stream_dvd.c8
-rw-r--r--stream/stream_dvd.h2
-rw-r--r--stream/stream_dvd_common.c2
-rw-r--r--stream/stream_file.c6
-rw-r--r--stream/stream_ftp.c6
-rw-r--r--stream/stream_lavf.c8
-rw-r--r--stream/stream_mf.c2
-rw-r--r--stream/stream_netstream.c8
-rw-r--r--stream/stream_netstream.h4
-rw-r--r--stream/stream_pvr.c2
-rw-r--r--stream/stream_radio.c8
-rw-r--r--stream/stream_smb.c6
-rw-r--r--stream/stream_tv.c6
-rw-r--r--stream/stream_vcd.c8
-rw-r--r--stream/stream_vstream.c6
-rw-r--r--stream/tcp.c2
-rw-r--r--stream/tv.c10
-rw-r--r--stream/tv.h2
-rw-r--r--stream/tvi_bsdbt848.c6
-rw-r--r--stream/tvi_def.h2
-rw-r--r--stream/tvi_dummy.c2
-rw-r--r--stream/tvi_v4l2.c6
-rw-r--r--stream/udp.c2
-rw-r--r--stream/url.c2
-rw-r--r--stream/vcd_read.h2
-rw-r--r--stream/vcd_read_darwin.h4
-rw-r--r--stream/vcd_read_fbsd.h2
-rw-r--r--stream/vcd_read_win32.h2
-rw-r--r--sub/ass_mp.c6
-rw-r--r--sub/dec_sub.c4
-rw-r--r--sub/draw_bmp.c10
-rw-r--r--sub/find_sub.c7
-rw-r--r--sub/find_subfiles.c8
-rw-r--r--sub/img_convert.c7
-rw-r--r--sub/osd_libass.c4
-rw-r--r--sub/sd_ass.c8
-rw-r--r--sub/sd_lavc.c4
-rw-r--r--sub/spudec.c6
-rw-r--r--sub/sub.c9
-rw-r--r--sub/subassconvert.c4
-rw-r--r--sub/subreader.c6
-rw-r--r--sub/vobsub.c6
-rw-r--r--talloc.h2
-rw-r--r--video/decode/dec_video.c22
-rw-r--r--video/decode/dec_video.h2
-rw-r--r--video/decode/vd.c16
-rw-r--r--video/decode/vd.h6
-rw-r--r--video/decode/vd_lavc.c22
-rw-r--r--video/filter/pullup.c4
-rw-r--r--video/filter/vf.c12
-rw-r--r--video/filter/vf.h11
-rw-r--r--video/filter/vf_crop.c12
-rw-r--r--video/filter/vf_delogo.c14
-rw-r--r--video/filter/vf_divtc.c12
-rw-r--r--video/filter/vf_dlopen.c10
-rw-r--r--video/filter/vf_down3dright.c10
-rw-r--r--video/filter/vf_dsize.c6
-rw-r--r--video/filter/vf_eq2.c8
-rw-r--r--video/filter/vf_expand.c14
-rw-r--r--video/filter/vf_flip.c6
-rw-r--r--video/filter/vf_format.c10
-rw-r--r--video/filter/vf_gradfun.c14
-rw-r--r--video/filter/vf_hqdn3d.c6
-rw-r--r--video/filter/vf_ilpack.c8
-rw-r--r--video/filter/vf_mirror.c6
-rw-r--r--video/filter/vf_noformat.c10
-rw-r--r--video/filter/vf_noise.c10
-rw-r--r--video/filter/vf_phase.c8
-rw-r--r--video/filter/vf_pp.c8
-rw-r--r--video/filter/vf_pullup.c10
-rw-r--r--video/filter/vf_rotate.c6
-rw-r--r--video/filter/vf_scale.c22
-rw-r--r--video/filter/vf_screenshot.c12
-rw-r--r--video/filter/vf_softpulldown.c8
-rw-r--r--video/filter/vf_stereo3d.c14
-rw-r--r--video/filter/vf_sub.c16
-rw-r--r--video/filter/vf_swapuv.c6
-rw-r--r--video/filter/vf_unsharp.c10
-rw-r--r--video/filter/vf_vo.c8
-rw-r--r--video/filter/vf_yadif.c12
-rw-r--r--video/fmt-conversion.c4
-rw-r--r--video/image_writer.c15
-rw-r--r--video/img_format.c4
-rw-r--r--video/img_format.h2
-rw-r--r--video/mp_image.c8
-rw-r--r--video/mp_image.h4
-rw-r--r--video/out/aspect.c8
-rw-r--r--video/out/bitmap_packer.c6
-rw-r--r--video/out/cocoa_common.h2
-rw-r--r--video/out/cocoa_common.m12
-rw-r--r--video/out/geometry.c2
-rw-r--r--video/out/gl_common.c3
-rw-r--r--video/out/gl_common.h10
-rw-r--r--video/out/osx_common.c9
-rw-r--r--video/out/vo.c16
-rw-r--r--video/out/vo.h4
-rw-r--r--video/out/vo_caca.c14
-rw-r--r--video/out/vo_corevideo.m11
-rw-r--r--video/out/vo_direct3d.c18
-rw-r--r--video/out/vo_image.c21
-rw-r--r--video/out/vo_lavc.c16
-rw-r--r--video/out/vo_null.c8
-rw-r--r--video/out/vo_opengl.c18
-rw-r--r--video/out/vo_opengl_old.c12
-rw-r--r--video/out/vo_vdpau.c14
-rw-r--r--video/out/vo_x11.c12
-rw-r--r--video/out/vo_xv.c16
-rw-r--r--video/out/w32_common.c14
-rw-r--r--video/out/x11_common.c16
-rw-r--r--video/sws_utils.c10
250 files changed, 1171 insertions, 1187 deletions
diff --git a/.gitignore b/.gitignore
index 56bc6b1fa6..6fc7816d5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,16 +10,16 @@
/mpv
/mpv.app
/version.h
-/codecs.conf.h
-/input/input_conf.h
+/core/codecs.conf.h
+/core/input/input_conf.h
/tags
/TAGS
/locale
/po
-/libvo/vo_opengl_shaders.h
-/libmpdemux/ebml_defs.c
-/libmpdemux/ebml_types.h
-/libvo/vdpau_template.c
+/video/out/vo_opengl_shaders.h
+/video/out/vdpau_template.c
+/demux/ebml_defs.c
+/demux/ebml_types.h
/sub/osd_font.h
-DOCS/man/*/mpv.1
+/DOCS/man/*/mpv.1
diff --git a/DOCS/tech-overview.txt b/DOCS/tech-overview.txt
index d407b92caa..0fb20e7e81 100644
--- a/DOCS/tech-overview.txt
+++ b/DOCS/tech-overview.txt
@@ -2,7 +2,7 @@ NOTE: DOCS/OUTDATED-tech/* may contain more detailed information, but most of it
is possibly or definitely outdated. This file intends to give a big
picture of how mplayer/mpv is structured.
-mplayer.c:
+core/mplayer.c:
This contains the main play loop, anything related to mplayer and playback
related initializations. It also contains the main function. Generally, it
accesses all other subsystems, initializes them, and pushes data between
@@ -72,7 +72,7 @@ talloc.h & talloc.c:
Documentation can be found here:
http://git.samba.org/?p=samba.git;a=blob;f=lib/talloc/talloc.h;hb=HEAD
-mp_core.h:
+core/mp_core.h:
Data structures for mplayer.c and command.c. They are usually not accessed
by other parts of mplayer for the sake of modularization.
@@ -83,7 +83,7 @@ mp_core.h:
options.h contains the global option struct MPOpts, and its default values
are in defaultopts.c for some reason.
-input/input.c:
+core/input/input.c:
This translates keyboard input comming from libvo and other sources (such
as remote control devices like Apple IR or slave mode commands) to the
key bindings listed in the user's (or the builtin) input.conf and turns
@@ -95,14 +95,14 @@ input/input.c:
direction of slave mode communication, mplayer to application, consists of
random mp_msg() calls all over the code in all parts of the player.)
-command.c:
+core/command.c:
This contains the implementation for slave commands and properties.
Properties are essentially dynamic variables changed by certain commands.
This is basically responsible for all user commands, like initiating
seeking, switching tracks, etc. It calls into mplayer.c, where most of the
work is done, but also into other parts of mplayer.
-mp_msg.h:
+core/mp_msg.h:
All terminal output should go though mp_msg().
stream/*:
@@ -123,7 +123,7 @@ stream/*:
cache2.c is a horrible little thing which provides a caching wrapper around
stream implementations, needed for smooth network playback.
-libmpdemux/:
+demux/:
Demuxers split data streams into audio/video/sub streams, which in turn
yield packets. Packets (see demux_packet.h) are mostly byte chunks tagged
with a playback time (PTS). These packets are passed to the decoders.
@@ -133,29 +133,28 @@ libmpdemux/:
There are some pseudo demuxers like demux_cue.c, which exist only to invoke
other frontend code (tl_cue.c in this case).
- The main interface is in demuxer.h. A demuxer provides a list of available
+ The main interface is in demux.h. A demuxer provides a list of available
streams. Also, for each type of stream (video/audio/sub) there is a
demux_stream. This contains the current packet stream coming from the
demuxer as a linked list of demux_packets.
-libmpcodecs/:
+video/:
This contains several things related to audio/video encoding, as well as
video filters.
mp_image.h and img_format.h define how mplayer stores video frames
internally.
+video/decode/:
vd_*.c are video decoders. (There's only vd_ffmpeg.c left.) dec_video.c/vd.c
handle most of connecting the frontend with the actual decoder.
+video/filter/:
vf_*.c and vf.c form the video filter chain. They are fed by the video
decoder, and output the filtered images to the VOs though vf_vo.c. By
default, no video filters (except vf_vo) are used.
- ad_*.c and dec_audio.c/ad.c handle audio decoding. The audio filter chain is
- separately in libaf.
-
-libvo/:
+video/out/:
Video output. They also create GUI windows and handle user input. In most
cases, the windowing code is shared among VOs, like x11_common.c for X11 and
w32_common.c for Windows. The VOs stand between frontend and windowing code.
@@ -167,12 +166,17 @@ libvo/:
vo_vdpau and vo_opengl should be taken as reference.
-libaf/:
- Audio filter chain. format.h/format.c define the audio formats.
+audio/:
+ format.h/format.c define the audio formats.
+
+audio/decode/:
+ ad_*.c and dec_audio.c/ad.c handle audio decoding.
+
+audio/filter/:
+ Audio filter chain.
-libao2/:
- Audio outputs. (It was probably named libao2 because libao is already
- another library unrelated to mplayer?)
+audio/out/:
+ Audio outputs.
Unlike VOs, AOs can't be reconfigured on a format change. Without
--gapless-audio, even playing a new file will close and re-open the audio
@@ -192,7 +196,7 @@ sub/:
subtitle event from the demuxer and converting it to ass for display is
different from loading a text subtitle and converting it to ass.
-timeline/:
+core/timeline/:
A timeline is the abstraction used by mplayer.c to combine several files
into one seemingly linear video. It's mainly used for ordered chapters
playback. The high level code to find and load other files containing the
diff --git a/Makefile b/Makefile
index c8b82d8f95..4241bb4cbf 100644
--- a/Makefile
+++ b/Makefile
@@ -23,292 +23,294 @@ include config.mak
###### variable declarations #######
-SRCS_AUDIO_INPUT-$(ALSA) += stream/ai_alsa1x.c
-SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c
-SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
-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-$(DVDREAD) += stream/stream_dvd.c \
- stream/stream_dvd_common.c
-
-SRCS_COMMON-$(FTP) += stream/stream_ftp.c
-SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c
-SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c osdep/mmap_anon.c
-SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c
-SRCS_COMMON-$(LIBASS) += sub/ass_mp.c sub/sd_ass.c
-
-SRCS_COMMON-$(LIBBLURAY) += stream/stream_bluray.c
-SRCS_COMMON-$(LIBBS2B) += libaf/af_bs2b.c
-
-SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c
-SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c
-
-SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.m
-SRCS_COMMON-$(COCOA) += libvo/osx_common.c \
- libvo/cocoa_common.m \
- osdep/cocoa_events.m
-SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
-SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c
-
-SRCS_COMMON-$(NEED_GETTIMEOFDAY) += osdep/gettimeofday.c
-SRCS_COMMON-$(NEED_GLOB) += osdep/glob-win.c
-SRCS_COMMON-$(NEED_SETENV) += osdep/setenv.c
-SRCS_COMMON-$(NEED_SHMEM) += osdep/shmem.c
-SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c
-SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c
-SRCS_COMMON-$(NETWORKING) += stream/stream_netstream.c \
- 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 \
-
-SRCS_COMMON-$(PRIORITY) += osdep/priority.c
-SRCS_COMMON-$(PVR) += stream/stream_pvr.c
-SRCS_COMMON-$(RADIO) += stream/stream_radio.c
-SRCS_COMMON-$(RADIO_CAPTURE) += stream/audio_in.c
-SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.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_V4L2) += stream/tvi_v4l2.c stream/audio_in.c
-SRCS_COMMON-$(VCD) += stream/stream_vcd.c
-SRCS_COMMON-$(VSTREAM) += stream/stream_vstream.c
-
-SRCS_COMMON-$(DUMMY_OSD) += sub/osd_dummy.c
-SRCS_COMMON-$(LIBASS_OSD) += sub/osd_libass.c
-
-SRCS_COMMON = asxparser.c \
- av_log.c \
- av_opts.c \
- bstr.c \
- codec-cfg.c \
- cpudetect.c \
- defaultopts.c \
- fmt-conversion.c \
- m_config.c \
- m_option.c \
- m_struct.c \
- mp_msg.c \
- mpcommon.c \
- version.c \
- parser-cfg.c \
- path.c \
- playlist.c \
- playlist_parser.c \
- subopt-helper.c \
- talloc.c \
- libaf/af.c \
- libaf/af_center.c \
- libaf/af_channels.c \
- libaf/af_delay.c \
- libaf/af_dummy.c \
- libaf/af_equalizer.c \
- libaf/af_extrastereo.c \
- libaf/af_format.c \
- libaf/af_hrtf.c \
- libaf/af_karaoke.c \
- libaf/af_lavcac3enc.c \
- libaf/af_lavcresample.c \
- libaf/af_pan.c \
- libaf/af_resample.c \
- libaf/af_scaletempo.c \
- libaf/af_sinesuppress.c \
- libaf/af_sub.c \
- libaf/af_surround.c \
- libaf/af_sweep.c \
- libaf/af_tools.c \
- libaf/af_volnorm.c \
- libaf/af_volume.c \
- libaf/filter.c \
- libaf/format.c \
- libaf/reorder_ch.c \
- libaf/window.c \
- libmpcodecs/ad.c \
- libmpcodecs/ad_ffmpeg.c \
- libmpcodecs/ad_pcm.c \
- libmpcodecs/ad_dvdpcm.c \
- libmpcodecs/ad_spdif.c \
- libmpcodecs/dec_audio.c \
- libmpcodecs/dec_video.c \
- libmpcodecs/img_format.c \
- libmpcodecs/mp_image.c \
- libmpcodecs/pullup.c \
- libmpcodecs/sws_utils.c \
- libmpcodecs/vd.c \
- libmpcodecs/vd_ffmpeg.c \
- libmpcodecs/vf.c \
- libmpcodecs/vf_crop.c \
- libmpcodecs/vf_delogo.c \
- libmpcodecs/vf_divtc.c \
- libmpcodecs/vf_dlopen.c \
- libmpcodecs/vf_down3dright.c \
- libmpcodecs/vf_dsize.c \
- libmpcodecs/vf_eq2.c \
- libmpcodecs/vf_expand.c \
- libmpcodecs/vf_flip.c \
- libmpcodecs/vf_format.c \
- libmpcodecs/vf_gradfun.c \
- libmpcodecs/vf_hqdn3d.c \
- libmpcodecs/vf_ilpack.c \
- libmpcodecs/vf_mirror.c \
- libmpcodecs/vf_noformat.c \
- libmpcodecs/vf_noise.c \
- libmpcodecs/vf_phase.c \
- libmpcodecs/vf_pullup.c \
- libmpcodecs/vf_rotate.c \
- libmpcodecs/vf_scale.c \
- libmpcodecs/vf_screenshot.c \
- libmpcodecs/vf_softpulldown.c \
- libmpcodecs/vf_stereo3d.c \
- libmpcodecs/vf_sub.c \
- libmpcodecs/vf_swapuv.c \
- libmpcodecs/vf_unsharp.c \
- libmpcodecs/vf_vo.c \
- libmpcodecs/vf_yadif.c \
- libmpdemux/asfheader.c \
- libmpdemux/aviheader.c \
- libmpdemux/aviprint.c \
- libmpdemux/demuxer.c \
- libmpdemux/demux_asf.c \
- libmpdemux/demux_avi.c \
- libmpdemux/demux_edl.c \
- libmpdemux/demux_cue.c \
- libmpdemux/demux_lavf.c \
- libmpdemux/demux_mf.c \
- libmpdemux/demux_mkv.c \
- libmpdemux/demux_mpg.c \
- libmpdemux/demux_ts.c \
- libmpdemux/mp3_hdr.c \
- libmpdemux/parse_es.c \
- libmpdemux/mpeg_hdr.c \
- libmpdemux/demux_rawaudio.c \
- libmpdemux/demux_rawvideo.c \
- libmpdemux/ebml.c \
- libmpdemux/extension.c \
- libmpdemux/mf.c \
- libmpdemux/mp_taglists.c \
- libmpdemux/video.c \
- libvo/bitmap_packer.c \
- osdep/numcores.c \
- osdep/io.c \
- osdep/$(GETCH) \
- osdep/$(TIMER) \
- stream/stream.c \
- stream/stream_ffmpeg.c \
- stream/stream_file.c \
- stream/stream_mf.c \
- stream/stream_null.c \
- stream/url.c \
- sub/dec_sub.c \
- sub/find_sub.c \
- sub/find_subfiles.c \
- sub/sd_lavc.c \
- sub/spudec.c \
- sub/sub.c \
- sub/img_convert.c \
- sub/draw_bmp.c \
- sub/subassconvert.c \
- sub/subreader.c \
- sub/vobsub.c \
- timeline/tl_edl.c \
- timeline/tl_matroska.c \
- timeline/tl_cue.c \
- $(SRCS_COMMON-yes)
-
-
-SRCS_MPLAYER-$(ALSA) += libao2/ao_alsa.c
-SRCS_MPLAYER-$(APPLE_IR) += input/appleir.c
-SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
-SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c
-SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c
-SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m
-SRCS_MPLAYER-$(DIRECT3D) += libvo/vo_direct3d.c libvo/w32_common.c
-SRCS_MPLAYER-$(DSOUND) += libao2/ao_dsound.c
-SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_opengl.c \
- libvo/gl_osd.c libvo/vo_opengl_old.c pnm_loader.c
-SRCS_MPLAYER-$(ENCODING) += libvo/vo_lavc.c libao2/ao_lavc.c encode_lavc.c
-SRCS_MPLAYER-$(GL_WIN32) += libvo/w32_common.c
-SRCS_MPLAYER-$(GL_X11) += libvo/x11_common.c
-
-SRCS_MPLAYER-$(JACK) += libao2/ao_jack.c
-SRCS_MPLAYER-$(JOYSTICK) += input/joystick.c
-SRCS_MPLAYER-$(LIBQUVI) += quvi.c
-SRCS_MPLAYER-$(LIRC) += input/lirc.c
-SRCS_MPLAYER-$(OPENAL) += libao2/ao_openal.c
-SRCS_MPLAYER-$(OSS) += libao2/ao_oss.c
-SRCS_MPLAYER-$(PULSE) += libao2/ao_pulse.c
-SRCS_MPLAYER-$(PORTAUDIO) += libao2/ao_portaudio.c
-SRCS_MPLAYER-$(RSOUND) += libao2/ao_rsound.c
-SRCS_MPLAYER-$(VDPAU) += libvo/vo_vdpau.c
-
-SRCS_MPLAYER-$(X11) += libvo/vo_x11.c libvo/x11_common.c
-SRCS_MPLAYER-$(XV) += libvo/vo_xv.c
-
-SRCS_MPLAYER = command.c \
- m_property.c \
- mixer.c \
- mp_fifo.c \
- mplayer.c \
- parser-mpcmd.c \
- screenshot.c \
- image_writer.c \
- input/input.c \
- libao2/ao_null.c \
- libao2/ao_pcm.c \
- libao2/audio_out.c \
- libvo/aspect.c \
- libvo/csputils.c \
- libvo/filter_kernels.c \
- libvo/geometry.c \
- libvo/video_out.c \
- libvo/vo_null.c \
- libvo/vo_image.c \
- $(SRCS_MPLAYER-yes)
-
-COMMON_LIBS += $(COMMON_LIBS-yes)
-
-OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)))
-OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)))
-OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mpv-rc.o
-OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
-
-MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
-DEP_FILES = $(patsubst %.S,%.d,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON:.m=.d) $(SRCS_MPLAYER:.m=.d))))
-
-ALL_PRG-$(MPLAYER) += mpv$(EXESUF)
-
-INSTALL_TARGETS-$(MPLAYER) += check_rst2man \
- install-mpv \
- install-mpv-man \
- install-mpv-msg
-
-INSTALL_NO_MAN_TARGETS-$(MPLAYER) += install-mpv \
- install-mpv-msg
+SOURCES_AUDIO_INPUT-$(ALSA) += stream/ai_alsa1x.c
+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-$(GIF) += demux/demux_gif.c
+SOURCES-$(HAVE_SYS_MMAN_H) += audio/filter/af_export.c osdep/mmap_anon.c
+SOURCES-$(LADSPA) += audio/filter/af_ladspa.c
+SOURCES-$(LIBASS) += sub/ass_mp.c sub/sd_ass.c
+
+SOURCES-$(LIBBLURAY) += stream/stream_bluray.c
+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-$(COCOA) += video/out/osx_common.c \
+ video/out/cocoa_common.m \
+ osdep/cocoa_events.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_SETENV) += osdep/setenv.c
+SOURCES-$(NEED_SHMEM) += osdep/shmem.c
+SOURCES-$(NEED_STRSEP) += osdep/strsep.c
+SOURCES-$(NEED_VSSCANF) += osdep/vsscanf.c
+SOURCES-$(NETWORKING) += stream/stream_netstream.c \
+ 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-$(TV) += stream/stream_tv.c stream/tv.c \
+ stream/frequencies.c stream/tvi_dummy.c
+SOURCES-$(TV_BSDBT848) += stream/tvi_bsdbt848.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
+
+SOURCES-$(ALSA) += audio/out/ao_alsa.c
+SOURCES-$(APPLE_IR) += core/input/appleir.c
+SOURCES-$(APPLE_REMOTE) += core/input/ar.c
+SOURCES-$(CACA) += video/out/vo_caca.c
+SOURCES-$(COREAUDIO) += audio/out/ao_coreaudio.c
+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-$(GL) += video/out/gl_common.c video/out/gl_osd.c \
+ video/out/vo_opengl.c \
+ video/out/vo_opengl_old.c \
+ video/out/pnm_loader.c
+
+SOURCES-$(ENCODING) += video/out/vo_lavc.c audio/out/ao_lavc.c \
+ core/encode_lavc.c
+SOURCES-$(GL_WIN32) += video/out/w32_common.c
+SOURCES-$(GL_X11) += video/out/x11_common.c
+
+SOURCES-$(JACK) += audio/out/ao_jack.c
+SOURCES-$(JOYSTICK) += core/input/joystick.c
+SOURCES-$(LIBQUVI) += core/quvi.c
+SOURCES-$(LIRC) += core/input/lirc.c
+SOURCES-$(OPENAL) += audio/out/ao_openal.c
+SOURCES-$(OSS) += audio/out/ao_oss.c
+SOURCES-$(PULSE) += audio/out/ao_pulse.c
+SOURCES-$(PORTAUDIO) += audio/out/ao_portaudio.c
+SOURCES-$(RSOUND) += audio/out/ao_rsound.c
+SOURCES-$(VDPAU) += video/out/vo_vdpau.c
+
+SOURCES-$(X11) += video/out/vo_x11.c video/out/x11_common.c
+SOURCES-$(XV) += video/out/vo_xv.c
+
+
+SOURCES = talloc.c \
+ audio/format.c \
+ audio/mixer.c \
+ audio/reorder_ch.c \
+ audio/decode/ad.c \
+ audio/decode/ad_dvdpcm.c \
+ audio/decode/ad_lavc.c \
+ audio/decode/ad_pcm.c \
+ audio/decode/ad_spdif.c \
+ audio/decode/dec_audio.c \
+ audio/filter/af.c \
+ audio/filter/af_center.c \
+ audio/filter/af_channels.c \
+ audio/filter/af_delay.c \
+ audio/filter/af_dummy.c \
+ audio/filter/af_equalizer.c \
+ audio/filter/af_extrastereo.c \
+ audio/filter/af_format.c \
+ audio/filter/af_hrtf.c \
+ audio/filter/af_karaoke.c \
+ audio/filter/af_lavcac3enc.c \
+ audio/filter/af_lavcresample.c \
+ audio/filter/af_pan.c \
+ audio/filter/af_resample.c \
+ audio/filter/af_scaletempo.c \
+ audio/filter/af_sinesuppress.c \
+ audio/filter/af_sub.c \
+ audio/filter/af_surround.c \
+ audio/filter/af_sweep.c \
+ audio/filter/af_tools.c \
+ audio/filter/af_volnorm.c \
+ audio/filter/af_volume.c \
+ audio/filter/filter.c \
+ audio/filter/window.c \
+ audio/out/ao.c \
+ audio/out/ao_null.c \
+ audio/out/ao_pcm.c \
+ core/asxparser.c \
+ core/av_log.c \
+ core/av_opts.c \
+ core/bstr.c \
+ core/codec-cfg.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/mplayer.c \
+ core/parser-cfg.c \
+ core/parser-mpcmd.c \
+ core/path.c \
+ core/playlist.c \
+ core/playlist_parser.c \
+ core/screenshot.c \
+ core/subopt-helper.c \
+ core/version.c \
+ core/input/input.c \
+ core/timeline/tl_edl.c \
+ core/timeline/tl_matroska.c \
+ core/timeline/tl_cue.c \
+ demux/asfheader.c \
+ demux/aviheader.c \
+ demux/aviprint.c \
+ demux/demux.c \
+ demux/demux_asf.c \
+ demux/demux_avi.c \
+ demux/demux_edl.c \
+ demux/demux_cue.c \
+ demux/demux_lavf.c \
+ demux/demux_mf.c \
+ demux/demux_mkv.c \
+ demux/demux_mpg.c \
+ demux/demux_ts.c \
+ demux/mp3_hdr.c \
+ demux/parse_es.c \
+ demux/mpeg_hdr.c \
+ demux/demux_rawaudio.c \
+ demux/demux_rawvideo.c \
+ demux/ebml.c \
+ demux/extension.c \
+ demux/mf.c \
+ demux/mp_taglists.c \
+ demux/video.c \
+ osdep/numcores.c \
+ osdep/io.c \
+ stream/stream.c \
+ stream/stream_file.c \
+ stream/stream_lavf.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/spudec.c \
+ sub/sub.c \
+ sub/subassconvert.c \
+ sub/subreader.c \
+ sub/vobsub.c \
+ video/csputils.c \
+ video/fmt-conversion.c \
+ video/image_writer.c \
+ video/img_format.c \
+ video/mp_image.c \
+ video/sws_utils.c \
+ video/decode/dec_video.c \
+ video/decode/vd.c \
+ video/decode/vd_lavc.c \
+ video/filter/vf.c \
+ video/filter/pullup.c \
+ video/filter/vf_crop.c \
+ video/filter/vf_delogo.c \
+ video/filter/vf_divtc.c \
+ video/filter/vf_dlopen.c \
+ video/filter/vf_down3dright.c \
+ video/filter/vf_dsize.c \
+ video/filter/vf_eq2.c \
+ video/filter/vf_expand.c \
+ video/filter/vf_flip.c \
+ video/filter/vf_format.c \
+ video/filter/vf_gradfun.c \
+ video/filter/vf_hqdn3d.c \
+ video/filter/vf_ilpack.c \
+ video/filter/vf_mirror.c \
+ video/filter/vf_noformat.c \
+ video/filter/vf_noise.c \
+ video/filter/vf_phase.c \
+ video/filter/vf_pullup.c \
+ video/filter/vf_rotate.c \
+ video/filter/vf_scale.c \
+ video/filter/vf_screenshot.c \
+ video/filter/vf_softpulldown.c \
+ video/filter/vf_stereo3d.c \
+ video/filter/vf_sub.c \
+ video/filter/vf_swapuv.c \
+ video/filter/vf_unsharp.c \
+ video/filter/vf_vo.c \
+ video/filter/vf_yadif.c \
+ video/out/bitmap_packer.c \
+ video/out/aspect.c \
+ video/out/filter_kernels.c \
+ video/out/geometry.c \
+ video/out/vo.c \
+ video/out/vo_null.c \
+ video/out/vo_image.c \
+ osdep/$(GETCH) \
+ osdep/$(TIMER) \
+ $(SOURCES-yes)
+
+OBJECTS += $(addsuffix .o, $(basename $(SOURCES)))
+OBJECTS-$(PE_EXECUTABLE) += osdep/mpv-rc.o
+OBJECTS += $(OBJECTS-yes)
+
+DEP_FILES = $(patsubst %.S,%.d,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SOURCES:.m=.d) $(SOURCES:.m=.d))))
+
+ALL_PRG += mpv$(EXESUF)
+
+INSTALL_TARGETS += check_rst2man \
+ install-mpv \
+ install-mpv-man \
+ install-mpv-msg
+
+INSTALL_NO_MAN_TARGETS += install-mpv \
+ install-mpv-msg
DIRS = . \
- input \
- libaf \
- libao2 \
- libmpcodecs \
- libmpdemux \
- libvo \
+ audio \
+ audio/decode \
+ audio/filter \
+ audio/out \
+ core \
+ core/input \
+ core/timeline \
+ demux \
osdep \
stream \
sub \
- timeline \
+ video \
+ video/decode \
+ video/filter \
+ video/out
MOFILES := $(MSG_LANGS:%=locale/%/LC_MESSAGES/mpv.mo)
-ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h))
ADDSUFFIXES = $(foreach suf,$(1),$(addsuffix $(suf),$(2)))
ADD_ALL_DIRS = $(call ADDSUFFIXES,$(1),$(DIRS))
@@ -323,7 +325,7 @@ endif
###### generic rules #######
-all: $(ALL_PRG-yes) locales
+all: $(ALL_PRG) locales
%.1: %.rst
$(RST2MAN) $< $@
@@ -343,33 +345,32 @@ all: $(ALL_PRG-yes) locales
%-rc.o: %.rc
$(WINDRES) -I. $< $@
-mpv$(EXESUF): $(MPLAYER_DEPS)
-mpv$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER)
+mpv$(EXESUF): $(OBJECTS)
mpv$(EXESUF):
$(CC) -o $@ $^ $(EXTRALIBS)
-codec-cfg.c: codecs.conf.h
-codecs.conf.h: TOOLS/file2string.pl etc/codecs.conf
+core/codec-cfg.c: core/codecs.conf.h
+core/codecs.conf.h: TOOLS/file2string.pl etc/codecs.conf
./$^ >$@
-input/input.c: input/input_conf.h
-input/input_conf.h: TOOLS/file2string.pl etc/input.conf
+core/input/input.c: core/input/input_conf.h
+core/input/input_conf.h: TOOLS/file2string.pl etc/input.conf
./$^ >$@
-libvo/vo_vdpau.c: libvo/vdpau_template.c
-libvo/vdpau_template.c: TOOLS/vdpau_functions.pl
+video/out/vo_vdpau.c: video/out/vdpau_template.c
+video/out/vdpau_template.c: TOOLS/vdpau_functions.pl
./$< > $@
-libmpdemux/ebml.c libmpdemux/demux_mkv.c: libmpdemux/ebml_types.h
-libmpdemux/ebml_types.h: TOOLS/matroska.pl
+demux/ebml.c demux/demux_mkv.c: demux/ebml_types.h
+demux/ebml_types.h: TOOLS/matroska.pl
./$< --generate-header > $@
-libmpdemux/ebml.c: libmpdemux/ebml_defs.c
-libmpdemux/ebml_defs.c: TOOLS/matroska.pl
+demux/ebml.c: demux/ebml_defs.c
+demux/ebml_defs.c: TOOLS/matroska.pl
./$< --generate-definitions > $@
-libvo/vo_opengl.c: libvo/vo_opengl_shaders.h
-libvo/vo_opengl_shaders.h: TOOLS/file2string.pl libvo/vo_opengl_shaders.glsl
+video/out/vo_opengl.c: video/out/vo_opengl_shaders.h
+video/out/vo_opengl_shaders.h: TOOLS/file2string.pl video/out/vo_opengl_shaders.glsl
./$^ >$@
sub/osd_libass.c: sub/osd_font.h
@@ -400,13 +401,10 @@ locale/%/LC_MESSAGES/mpv.mo: po/%.po
%.ho: %.h
$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
-checkheaders: $(ALLHEADERS:.h=.ho)
-
-
###### dependency declarations / specific CFLAGS ######
-version.c osdep/mpv-rc.o: version.h
+core/version.c osdep/mpv-rc.o: version.h
osdep/mpv-rc.o: osdep/mpv.exe.manifest
@@ -464,11 +462,11 @@ clean:
-$(RM) $(call ADD_ALL_EXESUFS,mpv)
-$(RM) $(MOFILES)
-$(RM) version.h
- -$(RM) codecs.conf.h
- -$(RM) input/input_conf.h
- -$(RM) libvo/vdpau_template.c
- -$(RM) libmpdemux/ebml_types.h libmpdemux/ebml_defs.c
- -$(RM) libvo/vo_opengl_shaders.h
+ -$(RM) core/codecs.conf.h
+ -$(RM) core/input/input_conf.h
+ -$(RM) video/out/vdpau_template.c
+ -$(RM) demux/ebml_types.h demux/ebml_defs.c
+ -$(RM) video/out/vo_opengl_shaders.h
-$(RM) sub/osd_font.h
distclean: clean
diff --git a/audio/decode/ad.c b/audio/decode/ad.c
index 93cebed86d..ac344636e6 100644
--- a/audio/decode/ad.c
+++ b/audio/decode/ad.c
@@ -25,8 +25,8 @@
#include "config.h"
#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
+#include "demux/demux.h"
+#include "demux/stheader.h"
#include "ad.h"
/* Missed vorbis, mad, dshow */
diff --git a/audio/decode/ad.h b/audio/decode/ad.h
index 5396085d04..2de0e0641a 100644
--- a/audio/decode/ad.h
+++ b/audio/decode/ad.h
@@ -19,8 +19,8 @@
#ifndef MPLAYER_AD_H
#define MPLAYER_AD_H
-#include "mpc_info.h"
-#include "libmpdemux/stheader.h"
+#include "core/mpc_info.h"
+#include "demux/stheader.h"
typedef struct mp_codec_info ad_info_t;
diff --git a/audio/decode/ad_dvdpcm.c b/audio/decode/ad_dvdpcm.c
index 41f6a1426d..3b12c71c12 100644
--- a/audio/decode/ad_dvdpcm.c
+++ b/audio/decode/ad_dvdpcm.c
@@ -21,7 +21,7 @@
#include <unistd.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "ad_internal.h"
static const ad_info_t info =
diff --git a/audio/decode/ad_internal.h b/audio/decode/ad_internal.h
index 4cffc95126..1fed350b98 100644
--- a/audio/decode/ad_internal.h
+++ b/audio/decode/ad_internal.h
@@ -19,12 +19,12 @@
#ifndef MPLAYER_AD_INTERNAL_H
#define MPLAYER_AD_INTERNAL_H
-#include "codec-cfg.h"
-#include "libaf/format.h"
+#include "core/codec-cfg.h"
+#include "audio/format.h"
#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
+#include "demux/demux.h"
+#include "demux/stheader.h"
#include "ad.h"
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 2eacfadb8f..2342a6985f 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -28,13 +28,13 @@
#include "talloc.h"
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
#include "ad_internal.h"
-#include "libaf/reorder_ch.h"
+#include "audio/reorder_ch.h"
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
static const ad_info_t info =
{
diff --git a/audio/decode/ad_pcm.c b/audio/decode/ad_pcm.c
index c265dfcd56..01500b1274 100644
--- a/audio/decode/ad_pcm.c
+++ b/audio/decode/ad_pcm.c
@@ -26,8 +26,8 @@
#include "talloc.h"
#include "config.h"
#include "ad_internal.h"
-#include "libaf/format.h"
-#include "libaf/reorder_ch.h"
+#include "audio/format.h"
+#include "audio/reorder_ch.h"
static const ad_info_t info = {
"Uncompressed PCM audio decoder",
diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c
index 877bc99317..c22280cbf0 100644
--- a/audio/decode/ad_spdif.c
+++ b/audio/decode/ad_spdif.c
@@ -23,7 +23,7 @@
#include <libavutil/opt.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "ad_internal.h"
static const ad_info_t info = {
diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c
index 2602352e52..1444d39009 100644
--- a/audio/decode/dec_audio.c
+++ b/audio/decode/dec_audio.c
@@ -22,20 +22,20 @@
#include <assert.h>
#include "config.h"
-#include "mp_msg.h"
-#include "bstr.h"
+#include "core/mp_msg.h"
+#include "core/bstr.h"
#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
-#include "codec-cfg.h"
-#include "libmpdemux/stheader.h"
+#include "core/codec-cfg.h"
+#include "demux/stheader.h"
#include "dec_audio.h"
#include "ad.h"
-#include "libaf/format.h"
+#include "audio/format.h"
-#include "libaf/af.h"
+#include "audio/filter/af.h"
int fakemono = 0;
diff --git a/audio/decode/dec_audio.h b/audio/decode/dec_audio.h
index 0d4baf0666..986b85f22a 100644
--- a/audio/decode/dec_audio.h
+++ b/audio/decode/dec_audio.h
@@ -19,7 +19,7 @@
#ifndef MPLAYER_DEC_AUDIO_H
#define MPLAYER_DEC_AUDIO_H
-#include "libmpdemux/stheader.h"
+#include "demux/stheader.h"
struct bstr;
diff --git a/audio/filter/af.h b/audio/filter/af.h
index edce49a978..31abe1edee 100644
--- a/audio/filter/af.h
+++ b/audio/filter/af.h
@@ -23,11 +23,10 @@
#include "config.h"
-#include "options.h"
-#include "libaf/format.h"
+#include "core/options.h"
+#include "audio/format.h"
#include "control.h"
-#include "cpudetect.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
struct af_instance;
diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c
index ccbf3794c5..aebcc3b201 100644
--- a/audio/filter/af_bs2b.c
+++ b/audio/filter/af_bs2b.c
@@ -27,7 +27,7 @@
#include <string.h>
#include "af.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
/// Internal specific data of the filter
struct af_bs2b {
diff --git a/audio/filter/af_export.c b/audio/filter/af_export.c
index 441ec31ac3..2e25d8a642 100644
--- a/audio/filter/af_export.c
+++ b/audio/filter/af_export.c
@@ -38,7 +38,7 @@
#include <fcntl.h>
#include "af.h"
-#include "path.h"
+#include "core/path.h"
#define DEF_SZ 512 // default buffer size (in samples)
#define SHARED_FILE "mpv-af_export" /* default file name
diff --git a/audio/filter/af_format.c b/audio/filter/af_format.c
index 4ac9caaa85..6192091f5a 100644
--- a/audio/filter/af_format.c
+++ b/audio/filter/af_format.c
@@ -30,7 +30,7 @@
#include "config.h"
#include "af.h"
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
/* Functions used by play to convert the input audio to the correct
format */
diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c
index ad78266ad3..b54f5bf61e 100644
--- a/audio/filter/af_lavcac3enc.c
+++ b/audio/filter/af_lavcac3enc.c
@@ -32,7 +32,7 @@
#include "config.h"
#include "af.h"
-#include "reorder_ch.h"
+#include "audio/reorder_ch.h"
#define AC3_MAX_CHANNELS 6
diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c
index 0bbc220997..cf326fedfb 100644
--- a/audio/filter/af_scaletempo.c
+++ b/audio/filter/af_scaletempo.c
@@ -38,7 +38,7 @@
#include "af.h"
#include "libavutil/common.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
// Data for specific instances of this filter
typedef struct af_scaletempo_s
diff --git a/audio/format.c b/audio/format.c
index 88d66522a0..4ca7307ccf 100644
--- a/audio/format.c
+++ b/audio/format.c
@@ -24,7 +24,7 @@
#include <inttypes.h>
#include <limits.h>
-#include "af.h"
+#include "audio/filter/af.h"
int af_fmt2bits(int format)
{
diff --git a/audio/format.h b/audio/format.h
index e60c0789b9..a3edcad20c 100644
--- a/audio/format.h
+++ b/audio/format.h
@@ -25,7 +25,7 @@
#include <sys/types.h>
#include "config.h"
-#include "bstr.h"
+#include "core/bstr.h"
// Endianness
#define AF_FORMAT_BE (0<<0) // Big Endian
diff --git a/audio/mixer.c b/audio/mixer.c
index 2f9505a1ae..985ccb6516 100644
--- a/audio/mixer.c
+++ b/audio/mixer.c
@@ -21,9 +21,9 @@
#include <libavutil/common.h>
#include "config.h"
-#include "libao2/audio_out.h"
-#include "libaf/af.h"
-#include "mp_msg.h"
+#include "audio/out/ao.h"
+#include "audio/filter/af.h"
+#include "core/mp_msg.h"
#include "mixer.h"
diff --git a/audio/mixer.h b/audio/mixer.h
index ba90d0881c..3de92e1e03 100644
--- a/audio/mixer.h
+++ b/audio/mixer.h
@@ -21,9 +21,6 @@
#include <stdbool.h>
-#include "libaf/af.h"
-#include "libao2/audio_out.h"
-
enum {
SOFTVOL_NO = 0,
SOFTVOL_YES = 1,
diff --git a/audio/out/ao.c b/audio/out/ao.c
index ab8e60b753..915af93793 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -24,9 +24,9 @@
#include "talloc.h"
#include "config.h"
-#include "audio_out.h"
+#include "ao.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
// there are some globals:
struct ao *global_ao;
diff --git a/audio/out/ao.h b/audio/out/ao.h
index 9e172fd06c..2a7d15ae08 100644
--- a/audio/out/ao.h
+++ b/audio/out/ao.h
@@ -21,7 +21,7 @@
#include <stdbool.h>
-#include "bstr.h"
+#include "core/bstr.h"
#define CONTROL_OK 1
#define CONTROL_TRUE 1
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c
index 27119112cb..cd50a1c1d5 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -36,18 +36,18 @@
#include <alloca.h>
#include "config.h"
-#include "subopt-helper.h"
-#include "mixer.h"
-#include "mp_msg.h"
+#include "core/subopt-helper.h"
+#include "audio/mixer.h"
+#include "core/mp_msg.h"
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>
-#include "audio_out.h"
+#include "ao.h"
#include "audio_out_internal.h"
-#include "libaf/format.h"
+#include "audio/format.h"
static const ao_info_t info =
{
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index 146cfd2a22..850a6b2086 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -46,14 +46,14 @@
#include <unistd.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "audio_out.h"
+#include "ao.h"
#include "audio_out_internal.h"
-#include "libaf/format.h"
+#include "audio/format.h"
#include "osdep/timer.h"
#include "libavutil/fifo.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
static const ao_info_t info =
{
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c
index f2f44dd401..8d3124122c 100644
--- a/audio/out/ao_dsound.c
+++ b/audio/out/ao_dsound.c
@@ -33,12 +33,12 @@
#include <math.h>
#include "config.h"
-#include "libaf/format.h"
-#include "audio_out.h"
+#include "audio/format.h"
+#include "ao.h"
#include "audio_out_internal.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "osdep/timer.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
static const ao_info_t info =
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index b30f99a14e..2762954040 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -27,13 +27,13 @@
#include <unistd.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "audio_out.h"
+#include "ao.h"
#include "audio_out_internal.h"
-#include "libaf/format.h"
+#include "audio/format.h"
#include "osdep/timer.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
#include "libavutil/fifo.h"
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index ef76db2717..08e1aa5555 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -27,16 +27,15 @@
#include <libavutil/audioconvert.h>
#include "config.h"
-#include "options.h"
-#include "mpcommon.h"
-#include "fmt-conversion.h"
-#include "libaf/format.h"
-#include "libaf/reorder_ch.h"
+#include "core/options.h"
+#include "core/mp_common.h"
+#include "audio/format.h"
+#include "audio/reorder_ch.h"
#include "talloc.h"
-#include "audio_out.h"
-#include "mp_msg.h"
+#include "ao.h"
+#include "core/mp_msg.h"
-#include "encode_lavc.h"
+#include "core/encode_lavc.h"
static const char *sample_padding_signed = "\x00\x00\x00\x00";
static const char *sample_padding_u8 = "\x80";
diff --git a/audio/out/ao_null.c b/audio/out/ao_null.c
index 87f11a51b6..102f0a7013 100644
--- a/audio/out/ao_null.c
+++ b/audio/out/ao_null.c
@@ -25,8 +25,8 @@
#include "config.h"
#include "osdep/timer.h"
-#include "libaf/format.h"
-#include "audio_out.h"
+#include "audio/format.h"
+#include "ao.h"
struct priv {
unsigned last_time;
diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c
index e5a40a769d..157cf93ac4 100644
--- a/audio/out/ao_openal.c
+++ b/audio/out/ao_openal.c
@@ -35,13 +35,13 @@
#include <AL/alext.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "audio_out.h"
+#include "ao.h"
#include "audio_out_internal.h"
-#include "libaf/format.h"
+#include "audio/format.h"
#include "osdep/timer.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
static const ao_info_t info =
{
diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c
index 9d4dde4837..ff8f8a1840 100644
--- a/audio/out/ao_oss.c
+++ b/audio/out/ao_oss.c
@@ -31,8 +31,8 @@
#include <string.h>
#include "config.h"
-#include "mp_msg.h"
-#include "mixer.h"
+#include "core/mp_msg.h"
+#include "audio/mixer.h"
#ifdef HAVE_SYS_SOUNDCARD_H
#include <sys/soundcard.h>
@@ -42,9 +42,9 @@
#endif
#endif
-#include "libaf/format.h"
+#include "audio/format.h"
-#include "audio_out.h"
+#include "ao.h"
#include "audio_out_internal.h"
static const ao_info_t info =
diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c
index 0b1c527e89..f0fd390c8e 100644
--- a/audio/out/ao_pcm.c
+++ b/audio/out/ao_pcm.c
@@ -28,11 +28,11 @@
#include "talloc.h"
-#include "subopt-helper.h"
-#include "libaf/format.h"
-#include "libaf/reorder_ch.h"
-#include "audio_out.h"
-#include "mp_msg.h"
+#include "core/subopt-helper.h"
+#include "audio/format.h"
+#include "audio/reorder_ch.h"
+#include "ao.h"
+#include "core/mp_msg.h"
#ifdef __MINGW32__
// for GetFileType to detect pipes
diff --git a/audio/out/ao_portaudio.c b/audio/out/ao_portaudio.c
index 36b08f8288..b0744e8f8a 100644
--- a/audio/out/ao_portaudio.c
+++ b/audio/out/ao_portaudio.c
@@ -26,10 +26,10 @@
#include <portaudio.h>
#include "config.h"
-#include "subopt-helper.h"
-#include "libaf/format.h"
-#include "mp_msg.h"
-#include "audio_out.h"
+#include "core/subopt-helper.h"
+#include "audio/format.h"
+#include "core/mp_msg.h"
+#include "ao.h"
struct priv {
PaStream *stream;
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c
index 1d2ebc5281..539dbfa640 100644
--- a/audio/out/ao_pulse.c
+++ b/audio/out/ao_pulse.c
@@ -27,10 +27,10 @@
#include <pulse/pulseaudio.h>
#include "config.h"
-#include "libaf/format.h"
-#include "mp_msg.h"
-#include "audio_out.h"
-#include "input/input.h"
+#include "audio/format.h"
+#include "core/mp_msg.h"
+#include "ao.h"
+#include "core/input/input.h"
#define PULSE_CLIENT_NAME "mpv"
diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c
index 8232aad865..bf77b1e4c2 100644
--- a/audio/out/ao_rsound.c
+++ b/audio/out/ao_rsound.c
@@ -29,10 +29,10 @@
#include "talloc.h"
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
#include "osdep/timer.h"
-#include "libaf/format.h"
-#include "audio_out.h"
+#include "audio/format.h"
+#include "ao.h"
struct priv {
rsound_t *rd;
diff --git a/audio/out/audio_out_internal.h b/audio/out/audio_out_internal.h
index 215428fb0e..f3e92dff66 100644
--- a/audio/out/audio_out_internal.h
+++ b/audio/out/audio_out_internal.h
@@ -19,7 +19,7 @@
#ifndef MPLAYER_AUDIO_OUT_INTERNAL_H
#define MPLAYER_AUDIO_OUT_INTERNAL_H
-#include "options.h"
+#include "core/options.h"
// prototypes:
//static ao_info_t info;
diff --git a/audio/reorder_ch.c b/audio/reorder_ch.c
index 50379de2c5..4b51a79439 100644
--- a/audio/reorder_ch.c
+++ b/audio/reorder_ch.c
@@ -25,12 +25,12 @@
#include <inttypes.h>
#include <string.h>
-#include "reorder_ch.h"
+#include "audio/reorder_ch.h"
#ifdef TEST
#define mp_msg(mod,lev, fmt, args... ) printf( fmt, ## args )
#else
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#endif
diff --git a/configure b/configure
index f36fff9fc5..7ebadc28b6 100755
--- a/configure
+++ b/configure
@@ -436,7 +436,6 @@ _opt=-O2
_cross_compile=no
_prefix="/usr/local"
ffmpeg=auto
-_mplayer=yes
_encoding=yes
_x11=auto
_xshape=auto
@@ -621,8 +620,6 @@ for ac_option do
--disable-translation) _translation=no ;;
--enable-cross-compile) _cross_compile=yes ;;
--disable-cross-compile) _cross_compile=no ;;
- --enable-mpv) _mplayer=yes ;;
- --disable-mpv) _mplayer=no ;;
--enable-encoding) _encoding=yes ;;
--disable-encoding) _encoding=no ;;
--enable-x11) _x11=yes ;;
@@ -3332,8 +3329,7 @@ CFLAGS = $WARNFLAGS $ERRORFLAGS $WARN_CFLAGS $CFLAGS $extra_cflags
CXXFLAGS = $WARNFLAGS $ERRORFLAGS $CXXFLAGS $extra_cflags $extra_cxxflags
DEPFLAGS = $DEPFLAGS
-EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs
-EXTRALIBS_MPLAYER = $libs_mplayer
+EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs $libs_mplayer
GETCH = $_getch
TIMER = $_timer
@@ -3346,8 +3342,6 @@ ARCH = $arch
$(mak_enable "$arch_all" "$arch" ARCH)
$(mak_enable "$subarch_all" "$subarch" ARCH)
-MPLAYER = $_mplayer
-
NEED_GETTIMEOFDAY = $need_gettimeofday
NEED_GLOB = $need_glob
NEED_SHMEM = $need_shmem
diff --git a/core/asxparser.c b/core/asxparser.c
index 44236b8c18..17ce6b3e8c 100644
--- a/core/asxparser.c
+++ b/core/asxparser.c
@@ -27,9 +27,9 @@
#include "playlist.h"
#include "playlist_parser.h"
#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
#include "asxparser.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
typedef struct ASX_Parser_t ASX_Parser_t;
diff --git a/core/av_log.c b/core/av_log.c
index 4e27e98d0f..4a80488a4b 100644
--- a/core/av_log.c
+++ b/core/av_log.c
@@ -25,7 +25,7 @@
#include "av_log.h"
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include <libavutil/avutil.h>
#include <libavutil/log.h>
diff --git a/core/bstr.c b/core/bstr.c
index d3247ce1d6..5d8a47e9ac 100644
--- a/core/bstr.c
+++ b/core/bstr.c
@@ -25,7 +25,7 @@
#include "talloc.h"
-#include "bstr.h"
+#include "core/bstr.h"
int bstrcmp(struct bstr str1, struct bstr str2)
{
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h
index c0f4c91a9c..efb445cd68 100644
--- a/core/cfg-mplayer.h
+++ b/core/cfg-mplayer.h
@@ -26,13 +26,13 @@
#include <stddef.h>
#include <sys/types.h>
-#include "options.h"
+#include "core/options.h"
#include "config.h"
-#include "m_config.h"
-#include "m_option.h"
+#include "core/m_config.h"
+#include "core/m_option.h"
#include "stream/tv.h"
#include "stream/stream_radio.h"
-#include "libvo/csputils.h"
+#include "video/csputils.h"
extern char *lirc_configfile;
@@ -67,7 +67,7 @@ extern int reuse_socket;
extern int dvd_speed; /* stream/stream_dvd.c */
-/* defined in libmpdemux: */
+/* defined in demux: */
extern const m_option_t demux_rawaudio_opts[];
extern const m_option_t demux_rawvideo_opts[];
extern const m_option_t cdda_opts[];
@@ -204,7 +204,7 @@ const m_option_t mfopts_conf[]={
{NULL, NULL, 0, 0, 0, 0, NULL}
};
-#include "libaf/af.h"
+#include "audio/filter/af.h"
extern struct af_cfg af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c
const m_option_t audio_filter_conf[]={
{"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
diff --git a/core/codec-cfg.c b/core/codec-cfg.c
index da4c64c4c0..c8fc3c74bb 100644
--- a/core/codec-cfg.c
+++ b/core/codec-cfg.c
@@ -31,12 +31,12 @@
#include <stdint.h>
#include "config.h"
-#include "mp_msg.h"
-#include "libmpcodecs/img_format.h"
+#include "core/mp_msg.h"
+#include "video/img_format.h"
#include "codec-cfg.h"
-#include "bstr.h"
+#include "core/bstr.h"
#include "stream/stream.h"
-#include "path.h"
+#include "core/path.h"
static const char embedded_file[] =
#include "codecs.conf.h"
diff --git a/core/command.c b/core/command.c
index 14f24ac50e..f333f20f54 100644
--- a/core/command.c
+++ b/core/command.c
@@ -28,32 +28,33 @@
#include "command.h"
#include "input/input.h"
#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
+#include "demux/demux.h"
+#include "demux/stheader.h"
#include "codec-cfg.h"
#include "mplayer.h"
#include "playlist.h"
#include "playlist_parser.h"
#include "sub/sub.h"
#include "sub/dec_sub.h"
-#include "m_option.h"
+#include "core/m_option.h"
#include "m_property.h"
#include "m_config.h"
-#include "libmpcodecs/vf.h"
-#include "libmpcodecs/vd.h"
+#include "video/filter/vf.h"
+#include "video/decode/vd.h"
#include "mp_osd.h"
-#include "libvo/video_out.h"
-#include "libvo/csputils.h"
+#include "video/out/vo.h"
+#include "video/csputils.h"
#include "playlist.h"
-#include "libao2/audio_out.h"
-#include "mpcommon.h"
-#include "mixer.h"
-#include "libmpcodecs/dec_video.h"
-#include "libmpcodecs/dec_audio.h"
+#include "audio/mixer.h"
+#include "audio/out/ao.h"
+#include "core/mp_common.h"
+#include "audio/filter/af.h"
+#include "video/decode/dec_video.h"
+#include "audio/decode/dec_audio.h"
#include "osdep/strsep.h"
#include "sub/vobsub.h"
#include "sub/spudec.h"
-#include "path.h"
+#include "core/path.h"
#include "sub/ass_mp.h"
#include "stream/tv.h"
#include "stream/stream_radio.h"
@@ -64,10 +65,10 @@
#ifdef CONFIG_DVDREAD
#include "stream/stream_dvd.h"
#endif
-#include "m_struct.h"
+#include "core/m_struct.h"
#include "screenshot.h"
-#include "mp_core.h"
+#include "core/mp_core.h"
#include "mp_fifo.h"
#include "libavutil/avstring.h"
diff --git a/core/cpudetect.c b/core/cpudetect.c
index 283600aff6..62cb03008d 100644
--- a/core/cpudetect.c
+++ b/core/cpudetect.c
@@ -21,11 +21,11 @@
#include <stdlib.h>
#include <libavutil/cpu.h>
-#include "libav_compat.h"
+#include "compat/libav.h"
#include "config.h"
-#include "cpudetect.h"
-#include "mp_msg.h"
+#include "core/cpudetect.h"
+#include "core/mp_msg.h"
CpuCaps gCpuCaps;
diff --git a/core/cpudetect.h b/core/cpudetect.h
index 675dcbacde..d3d9206c65 100644
--- a/core/cpudetect.h
+++ b/core/cpudetect.h
@@ -22,7 +22,7 @@
#include <stdbool.h>
#include "config.h"
-#include "ffmpeg_files/x86_cpu.h"
+#include "compat/x86_cpu.h"
typedef struct cpucaps_s {
bool hasMMX;
diff --git a/core/defaultopts.c b/core/defaultopts.c
index 1d3abf932c..a20656dd02 100644
--- a/core/defaultopts.c
+++ b/core/defaultopts.c
@@ -2,8 +2,8 @@
#include "config.h"
#include "defaultopts.h"
-#include "options.h"
-#include "mixer.h"
+#include "core/options.h"
+#include "audio/mixer.h"
void set_default_mplayer_options(struct MPOpts *opts)
{
diff --git a/core/encode_lavc.c b/core/encode_lavc.c
index 5812fe0fed..d35db70b4f 100644
--- a/core/encode_lavc.c
+++ b/core/encode_lavc.c
@@ -22,11 +22,11 @@
#include "encode_lavc.h"
-#include "mp_msg.h"
-#include "libmpcodecs/vfcap.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "video/vfcap.h"
+#include "core/options.h"
#include "osdep/timer.h"
-#include "libvo/video_out.h"
+#include "video/out/vo.h"
#include "talloc.h"
#include "stream/stream.h"
diff --git a/core/encode_lavc.h b/core/encode_lavc.h
index 29b35c6335..747043b8b5 100644
--- a/core/encode_lavc.h
+++ b/core/encode_lavc.h
@@ -28,7 +28,7 @@
#include <libavutil/mathematics.h>
#include "encode.h"
-#include "libvo/csputils.h"
+#include "video/csputils.h"
struct encode_lavc_context {
struct encode_output_conf *options;
diff --git a/core/input/appleir.c b/core/input/appleir.c
index c64bc9648d..4615f1ef9d 100644
--- a/core/input/appleir.c
+++ b/core/input/appleir.c
@@ -37,7 +37,7 @@
#include <linux/types.h>
#include <linux/input.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
// keycodes.h defines would conflict with linux/input.h ones
#define AR_DEFINES_ONLY
diff --git a/core/input/input.c b/core/input/input.c
index 6643747e4d..115d181e69 100644
--- a/core/input/input.c
+++ b/core/input/input.c
@@ -34,18 +34,18 @@
#include "osdep/io.h"
#include "input.h"
-#include "mp_fifo.h"
+#include "core/mp_fifo.h"
#include "keycodes.h"
#include "osdep/timer.h"
#include "libavutil/avstring.h"
#include "libavutil/common.h"
-#include "mp_msg.h"
-#include "m_config.h"
-#include "m_option.h"
-#include "path.h"
+#include "core/mp_msg.h"
+#include "core/m_config.h"
+#include "core/m_option.h"
+#include "core/path.h"
#include "talloc.h"
-#include "options.h"
-#include "bstr.h"
+#include "core/options.h"
+#include "core/bstr.h"
#include "stream/stream.h"
#include "joystick.h"
@@ -545,7 +545,7 @@ static const m_option_t mp_input_opts[] = {
static int default_cmd_func(int fd, char *buf, int l);
static const char builtin_input_conf[] =
-#include "input/input_conf.h"
+#include "core/input/input_conf.h"
;
// Encode the unicode codepoint as UTF-8, and append to the end of the
diff --git a/core/input/input.h b/core/input/input.h
index 59f2d031ff..a1c633ad69 100644
--- a/core/input/input.h
+++ b/core/input/input.h
@@ -20,8 +20,8 @@
#define MPLAYER_INPUT_H
#include <stdbool.h>
-#include "bstr.h"
-#include "m_option.h"
+#include "core/bstr.h"
+#include "core/m_option.h"
// All command IDs
enum mp_command_type {
@@ -211,7 +211,7 @@ void mp_input_register_options(struct m_config *cfg);
// Wake up sleeping input loop from another thread.
void mp_input_wakeup(struct input_ctx *ictx);
-// Interruptible usleep: (used by libmpdemux)
+// Interruptible usleep: (used by demux)
int mp_input_check_interrupt(struct input_ctx *ictx, int time);
extern int async_quit_request;
diff --git a/core/input/joystick.c b/core/input/joystick.c
index 673ae92184..ae2bf7990b 100644
--- a/core/input/joystick.c
+++ b/core/input/joystick.c
@@ -30,7 +30,7 @@
#include <fcntl.h>
#include <errno.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "keycodes.h"
#ifndef JOY_AXIS_DELTA
diff --git a/core/input/lirc.c b/core/input/lirc.c
index fd64beb479..699168d239 100644
--- a/core/input/lirc.c
+++ b/core/input/lirc.c
@@ -26,7 +26,7 @@
#include <unistd.h>
#include <stdlib.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "input.h"
#include "lirc.h"
diff --git a/core/m_config.c b/core/m_config.c
index 7a4d711d3f..9c0ddf8e20 100644
--- a/core/m_config.c
+++ b/core/m_config.c
@@ -31,8 +31,8 @@
#include "talloc.h"
#include "m_config.h"
-#include "m_option.h"
-#include "mp_msg.h"
+#include "core/m_option.h"
+#include "core/mp_msg.h"
#define MAX_PROFILE_DEPTH 20
diff --git a/core/m_config.h b/core/m_config.h
index 9098a23c97..de89803cac 100644
--- a/core/m_config.h
+++ b/core/m_config.h
@@ -21,7 +21,7 @@
#include <stdbool.h>
-#include "bstr.h"
+#include "core/bstr.h"
// m_config provides an API to manipulate the config variables in MPlayer.
// It makes use of the Options API to provide a context stack that
diff --git a/core/m_option.c b/core/m_option.c
index 3f300326ca..f64b4deb20 100644
--- a/core/m_option.c
+++ b/core/m_option.c
@@ -35,8 +35,8 @@
#include <libavutil/avstring.h>
#include "talloc.h"
-#include "m_option.h"
-#include "mp_msg.h"
+#include "core/m_option.h"
+#include "core/mp_msg.h"
#include "stream/url.h"
char *m_option_strerror(int code)
@@ -1116,7 +1116,7 @@ const m_option_type_t m_option_type_subconfig_struct = {
.parse = parse_subconf,
};
-#include "libmpcodecs/img_format.h"
+#include "video/img_format.h"
static int parse_imgfmt(const m_option_t *opt, struct bstr name,
struct bstr param, void *dst)
@@ -1154,7 +1154,7 @@ const m_option_type_t m_option_type_imgfmt = {
.copy = copy_opt,
};
-#include "libaf/format.h"
+#include "audio/format.h"
static int parse_afmt(const m_option_t *opt, struct bstr name,
struct bstr param, void *dst)
@@ -1308,7 +1308,7 @@ const m_option_type_t m_option_type_time_size = {
//// Objects (i.e. filters, etc) settings
-#include "m_struct.h"
+#include "core/m_struct.h"
#undef VAL
#define VAL(x) (*(m_obj_settings_t **)(x))
diff --git a/core/m_option.h b/core/m_option.h
index 75f1c709d1..30bd6a9ff2 100644
--- a/core/m_option.h
+++ b/core/m_option.h
@@ -24,7 +24,7 @@
#include <stdbool.h>
#include "config.h"
-#include "bstr.h"
+#include "core/bstr.h"
// m_option allows to parse, print and copy data of various types.
diff --git a/core/m_property.c b/core/m_property.c
index f97bb366a4..8254218d0c 100644
--- a/core/m_property.c
+++ b/core/m_property.c
@@ -30,10 +30,10 @@
#include <libavutil/common.h>
#include "talloc.h"
-#include "m_option.h"
+#include "core/m_option.h"
#include "m_property.h"
-#include "mp_msg.h"
-#include "mpcommon.h"
+#include "core/mp_msg.h"
+#include "core/mp_common.h"
const struct m_option_type m_option_type_dummy = {
.name = "Unknown",
diff --git a/core/m_struct.c b/core/m_struct.c
index 7b885cc905..2bf5f36485 100644
--- a/core/m_struct.c
+++ b/core/m_struct.c
@@ -24,9 +24,9 @@
#include <stdlib.h>
#include <string.h>
-#include "m_option.h"
-#include "m_struct.h"
-#include "mp_msg.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
+#include "core/mp_msg.h"
const m_option_t*
m_struct_get_field(const m_struct_t* st,const char* f) {
diff --git a/core/m_struct.h b/core/m_struct.h
index 1645ae734a..6ddd221f1b 100644
--- a/core/m_struct.h
+++ b/core/m_struct.h
@@ -19,7 +19,7 @@
#ifndef MPLAYER_M_STRUCT_H
#define MPLAYER_M_STRUCT_H
-#include "bstr.h"
+#include "core/bstr.h"
/// \defgroup OptionsStruct Options struct
/// \ingroup Options
diff --git a/core/mp_common.c b/core/mp_common.c
index d4811440aa..eecd0710cc 100644
--- a/core/mp_common.c
+++ b/core/mp_common.c
@@ -17,7 +17,7 @@
*/
#include "talloc.h"
-#include "mpcommon.h"
+#include "core/mp_common.h"
char *mp_format_time(double time, bool fractions)
{
diff --git a/core/mp_core.h b/core/mp_core.h
index 99ce12b033..910bfb82a4 100644
--- a/core/mp_core.h
+++ b/core/mp_core.h
@@ -21,11 +21,11 @@
#include <stdbool.h>
-#include "options.h"
-#include "mixer.h"
+#include "core/options.h"
#include "sub/subreader.h"
#include "sub/find_subfiles.h"
-#include "libmpdemux/demuxer.h"
+#include "audio/mixer.h"
+#include "demux/demux.h"
// definitions used internally by the core player code
diff --git a/core/mp_fifo.c b/core/mp_fifo.c
index 701b7a0bc3..fd8a87098e 100644
--- a/core/mp_fifo.c
+++ b/core/mp_fifo.c
@@ -24,7 +24,7 @@
#include "input/keycodes.h"
#include "mp_fifo.h"
#include "talloc.h"
-#include "options.h"
+#include "core/options.h"
struct mp_fifo {
diff --git a/core/mp_fifo.h b/core/mp_fifo.h
index 015286db83..f08cd00415 100644
--- a/core/mp_fifo.h
+++ b/core/mp_fifo.h
@@ -19,7 +19,7 @@
#ifndef MPLAYER_MP_FIFO_H
#define MPLAYER_MP_FIFO_H
-#include "bstr.h"
+#include "core/bstr.h"
struct mp_fifo;
void mplayer_put_key(struct mp_fifo *fifo, int code);
diff --git a/core/mp_msg.c b/core/mp_msg.c
index 627ee04187..d0cce8e064 100644
--- a/core/mp_msg.c
+++ b/core/mp_msg.c
@@ -31,7 +31,7 @@
#include <libintl.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
/* maximum message length of mp_msg */
#define MSGSIZE_MAX 6144
diff --git a/core/mp_msg.h b/core/mp_msg.h
index 5f043243fa..320912dd4c 100644
--- a/core/mp_msg.h
+++ b/core/mp_msg.h
@@ -132,7 +132,7 @@ void mp_msg_init(void);
int mp_msg_test(int mod, int lev);
#include "config.h"
-#include "mpcommon.h"
+#include "core/mp_common.h"
char *mp_gtext(const char *string);
diff --git a/core/mplayer.c b/core/mplayer.c
index 7006614df1..180bb2a011 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -63,33 +63,33 @@
#include <errno.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "av_log.h"
-#include "m_option.h"
-#include "m_config.h"
-#include "mplayer.h"
-#include "m_property.h"
+#include "core/m_option.h"
+#include "core/m_config.h"
+#include "core/mplayer.h"
+#include "core/m_property.h"
#include "sub/subreader.h"
#include "sub/find_subfiles.h"
#include "sub/dec_sub.h"
-#include "mp_osd.h"
-#include "libvo/video_out.h"
-#include "screenshot.h"
+#include "core/mp_osd.h"
+#include "video/out/vo.h"
+#include "core/screenshot.h"
#include "sub/sub.h"
-#include "cpudetect.h"
+#include "core/cpudetect.h"
#ifdef CONFIG_X11
-#include "libvo/x11_common.h"
+#include "video/out/x11_common.h"
#endif
-#include "libao2/audio_out.h"
+#include "audio/out/ao.h"
-#include "codec-cfg.h"
+#include "core/codec-cfg.h"
#include "sub/spudec.h"
#include "sub/vobsub.h"
@@ -97,9 +97,9 @@
#include "osdep/getch2.h"
#include "osdep/timer.h"
-#include "input/input.h"
+#include "core/input/input.h"
-#include "encode.h"
+#include "core/encode.h"
int slave_mode = 0;
int enable_mouse_movements = 0;
@@ -119,20 +119,20 @@ char *heartbeat_cmd;
//**************************************************************************//
// Playtree
//**************************************************************************//
-#include "playlist.h"
-#include "playlist_parser.h"
+#include "core/playlist.h"
+#include "core/playlist_parser.h"
//**************************************************************************//
// Config
//**************************************************************************//
-#include "parser-cfg.h"
-#include "parser-mpcmd.h"
+#include "core/parser-cfg.h"
+#include "core/parser-mpcmd.h"
//**************************************************************************//
// Config file
//**************************************************************************//
-#include "path.h"
+#include "core/path.h"
//**************************************************************************//
//**************************************************************************//
@@ -142,24 +142,24 @@ char *heartbeat_cmd;
static int max_framesize = 0;
#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
+#include "demux/demux.h"
+#include "demux/stheader.h"
#ifdef CONFIG_DVDREAD
#include "stream/stream_dvd.h"
#endif
-#include "libmpcodecs/dec_audio.h"
-#include "libmpcodecs/dec_video.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/vf.h"
-#include "libmpcodecs/vd.h"
+#include "audio/decode/dec_audio.h"
+#include "video/decode/dec_video.h"
+#include "video/mp_image.h"
+#include "video/filter/vf.h"
+#include "video/decode/vd.h"
-#include "mixer.h"
+#include "audio/mixer.h"
-#include "mp_core.h"
-#include "options.h"
-#include "defaultopts.h"
+#include "core/mp_core.h"
+#include "core/options.h"
+#include "core/defaultopts.h"
static const char help_text[] = _(
"Usage: mpv [options] [url|path/]filename\n"
@@ -200,7 +200,7 @@ static const char av_desync_help_text[] = _(
//**************************************************************************//
//**************************************************************************//
-#include "mp_fifo.h"
+#include "core/mp_fifo.h"
static int drop_frame_cnt; // total number of dropped frames
@@ -244,8 +244,8 @@ char *edl_output_filename; // file to put EDL entries in (-edlout)
int use_filedir_conf;
-#include "mpcommon.h"
-#include "command.h"
+#include "core/mp_common.h"
+#include "core/command.h"
static void reset_subtitles(struct MPContext *mpctx);
static void reinit_subs(struct MPContext *mpctx);
@@ -789,11 +789,11 @@ static void load_per_file_options(m_config_t *conf,
m_config_set_option(conf, params[n].name, params[n].value);
}
-/* When libmpdemux performs a blocking operation (network connection or
+/* When demux performs a blocking operation (network connection or
* cache filling) if the operation fails we use this function to check
* if it was interrupted by the user.
* The function returns whether it was interrupted. */
-static bool libmpdemux_was_interrupted(struct MPContext *mpctx)
+static bool demux_was_interrupted(struct MPContext *mpctx)
{
for (;;) {
if (mpctx->stop_play != KEEP_PLAYING
@@ -3741,7 +3741,7 @@ static void play_current_file(struct MPContext *mpctx)
stream_filename = mpctx->resolve_result->url;
mpctx->stream = open_stream(stream_filename, opts, &mpctx->file_format);
if (!mpctx->stream) { // error...
- libmpdemux_was_interrupted(mpctx);
+ demux_was_interrupted(mpctx);
goto terminate_playback;
}
mpctx->initialized_flags |= INITIALIZED_STREAM;
@@ -3778,7 +3778,7 @@ goto_enable_cache:
opts->stream_cache_min_percent,
opts->stream_cache_seek_min_percent);
if (res == 0)
- if (libmpdemux_was_interrupted(mpctx))
+ if (demux_was_interrupted(mpctx))
goto terminate_playback;
}
diff --git a/core/mplayer.h b/core/mplayer.h
index 1e99308656..004c770901 100644
--- a/core/mplayer.h
+++ b/core/mplayer.h
@@ -21,7 +21,7 @@
#include <stdlib.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
extern char ** audio_fm_list;
extern char ** video_fm_list;
diff --git a/core/parser-cfg.c b/core/parser-cfg.c
index 8ab403ba45..a0e758e6a3 100644
--- a/core/parser-cfg.c
+++ b/core/parser-cfg.c
@@ -28,8 +28,8 @@
#include "osdep/io.h"
#include "parser-cfg.h"
-#include "mp_msg.h"
-#include "m_option.h"
+#include "core/mp_msg.h"
+#include "core/m_option.h"
#include "m_config.h"
/// Maximal include depth.
diff --git a/core/parser-mpcmd.c b/core/parser-mpcmd.c
index 730e4c581f..8007344a26 100644
--- a/core/parser-mpcmd.c
+++ b/core/parser-mpcmd.c
@@ -25,8 +25,8 @@
#include <assert.h>
#include <stdbool.h>
-#include "mp_msg.h"
-#include "m_option.h"
+#include "core/mp_msg.h"
+#include "core/m_option.h"
#include "m_config.h"
#include "playlist.h"
#include "playlist_parser.h"
diff --git a/core/path.c b/core/path.c
index 6002189225..0e8d5e4614 100644
--- a/core/path.c
+++ b/core/path.c
@@ -31,8 +31,8 @@
#include <sys/stat.h>
#include <unistd.h>
#include "config.h"
-#include "mp_msg.h"
-#include "path.h"
+#include "core/mp_msg.h"
+#include "core/path.h"
#ifdef CONFIG_MACOSX_BUNDLE
#include <CoreFoundation/CoreFoundation.h>
diff --git a/core/path.h b/core/path.h
index 6e3ec9372e..0c7dbcca41 100644
--- a/core/path.h
+++ b/core/path.h
@@ -22,7 +22,7 @@
#define MPLAYER_PATH_H
#include <stdbool.h>
-#include "bstr.h"
+#include "core/bstr.h"
char *get_path(const char *filename);
diff --git a/core/playlist.c b/core/playlist.c
index 55a0e5cf4a..5456931afa 100644
--- a/core/playlist.c
+++ b/core/playlist.c
@@ -18,9 +18,9 @@
#include <assert.h>
#include "config.h"
#include "playlist.h"
-#include "mpcommon.h"
+#include "core/mp_common.h"
#include "talloc.h"
-#include "path.h"
+#include "core/path.h"
struct playlist_entry *playlist_entry_new(const char *filename)
{
diff --git a/core/playlist.h b/core/playlist.h
index eb2ef9ed99..f896751eb6 100644
--- a/core/playlist.h
+++ b/core/playlist.h
@@ -19,7 +19,7 @@
#define MPLAYER_PLAYLIST_H
#include <stdbool.h>
-#include "bstr.h"
+#include "core/bstr.h"
struct playlist_param {
bstr name, value;
diff --git a/core/playlist_parser.c b/core/playlist_parser.c
index 0edabc13b9..98eebaa47e 100644
--- a/core/playlist_parser.c
+++ b/core/playlist_parser.c
@@ -35,9 +35,9 @@
#include "playlist.h"
#include "playlist_parser.h"
#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
-#include "mp_msg.h"
-#include "path.h"
+#include "demux/demux.h"
+#include "core/mp_msg.h"
+#include "core/path.h"
#define BUF_STEP 1024
diff --git a/core/quvi.c b/core/quvi.c
index 7be5f39bea..697b3736d4 100644
--- a/core/quvi.c
+++ b/core/quvi.c
@@ -19,8 +19,8 @@
#include <quvi/quvi.h>
#include "talloc.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
#include "mplayer.h"
struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts)
diff --git a/core/screenshot.c b/core/screenshot.c
index b84bb6d340..e2d237010c 100644
--- a/core/screenshot.c
+++ b/core/screenshot.c
@@ -25,20 +25,20 @@
#include "osdep/io.h"
#include "talloc.h"
-#include "screenshot.h"
-#include "mp_core.h"
-#include "command.h"
-#include "bstr.h"
-#include "mp_msg.h"
-#include "path.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/dec_video.h"
-#include "libmpcodecs/vf.h"
-#include "libvo/video_out.h"
-#include "image_writer.h"
+#include "core/screenshot.h"
+#include "core/mp_core.h"
+#include "core/command.h"
+#include "core/bstr.h"
+#include "core/mp_msg.h"
+#include "core/path.h"
+#include "video/mp_image.h"
+#include "video/decode/dec_video.h"
+#include "video/filter/vf.h"
+#include "video/out/vo.h"
+#include "video/image_writer.h"
#include "sub/sub.h"
-#include "libvo/csputils.h"
+#include "video/csputils.h"
#define MODE_FULL_WINDOW 1
#define MODE_SUBTITLES 2
diff --git a/core/subopt-helper.c b/core/subopt-helper.c
index 901a2de09e..9216abeeae 100644
--- a/core/subopt-helper.c
+++ b/core/subopt-helper.c
@@ -35,8 +35,8 @@
*
*/
-#include "subopt-helper.h"
-#include "mp_msg.h"
+#include "core/subopt-helper.h"
+#include "core/mp_msg.h"
#include <stdlib.h>
#include <string.h>
diff --git a/core/timeline/tl_cue.c b/core/timeline/tl_cue.c
index cfc67bdd84..d9160e0b8e 100644
--- a/core/timeline/tl_cue.c
+++ b/core/timeline/tl_cue.c
@@ -24,12 +24,12 @@
#include "talloc.h"
-#include "mp_core.h"
-#include "mp_msg.h"
-#include "libmpdemux/demuxer.h"
-#include "path.h"
-#include "bstr.h"
-#include "mpcommon.h"
+#include "core/mp_core.h"
+#include "core/mp_msg.h"
+#include "demux/demux.h"
+#include "core/path.h"
+#include "core/bstr.h"
+#include "core/mp_common.h"
#include "stream/stream.h"
// used by demuxer_cue.c
diff --git a/core/timeline/tl_edl.c b/core/timeline/tl_edl.c
index 3c8cd21781..1af36a54f8 100644
--- a/core/timeline/tl_edl.c
+++ b/core/timeline/tl_edl.c
@@ -23,12 +23,12 @@
#include "talloc.h"
-#include "mp_core.h"
-#include "mp_msg.h"
-#include "libmpdemux/demuxer.h"
-#include "path.h"
-#include "bstr.h"
-#include "mpcommon.h"
+#include "core/mp_core.h"
+#include "core/mp_msg.h"
+#include "demux/demux.h"
+#include "core/path.h"
+#include "core/bstr.h"
+#include "core/mp_common.h"
#include "stream/stream.h"
diff --git a/core/timeline/tl_matroska.c b/core/timeline/tl_matroska.c
index 9387201866..a87889edd8 100644
--- a/core/timeline/tl_matroska.c
+++ b/core/timeline/tl_matroska.c
@@ -30,12 +30,12 @@
#include "talloc.h"
-#include "mp_core.h"
-#include "mp_msg.h"
-#include "libmpdemux/demuxer.h"
-#include "path.h"
-#include "bstr.h"
-#include "mpcommon.h"
+#include "core/mp_core.h"
+#include "core/mp_msg.h"
+#include "demux/demux.h"
+#include "core/path.h"
+#include "core/bstr.h"
+#include "core/mp_common.h"
#include "stream/stream.h"
struct find_entry {
diff --git a/demux/asf.h b/demux/asf.h
index 2886a4d752..db48f72edb 100644
--- a/demux/asf.h
+++ b/demux/asf.h
@@ -22,7 +22,7 @@
#include <sys/types.h>
#include <inttypes.h>
#include "libavutil/common.h"
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
///////////////////////
// ASF Object Header
diff --git a/demux/asfguid.h b/demux/asfguid.h
index 91b2760b28..e1dfed87d1 100644
--- a/demux/asfguid.h
+++ b/demux/asfguid.h
@@ -23,7 +23,7 @@
#include <inttypes.h>
#include "libavutil/common.h"
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
#define ASF_LOAD_GUID_PREFIX(guid) AV_RL32(guid)
diff --git a/demux/asfheader.c b/demux/asfheader.c
index bd775b7660..9bbe8e3dce 100644
--- a/demux/asfheader.c
+++ b/demux/asfheader.c
@@ -26,11 +26,11 @@
#include <libavutil/common.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream/stream.h"
#include "aviprint.h"
-#include "demuxer.h"
+#include "demux.h"
#include "stheader.h"
#include "asf.h"
diff --git a/demux/asfheader.h b/demux/asfheader.h
index 9c239f7987..3741f22cd6 100644
--- a/demux/asfheader.h
+++ b/demux/asfheader.h
@@ -20,7 +20,7 @@
#define MPLAYER_ASFHEADER_H
#include "asf.h"
-#include "demuxer.h"
+#include "demux.h"
int asf_check_header(demuxer_t *demuxer);
int read_asf_header(demuxer_t *demuxer, struct asf_priv *asf);
diff --git a/demux/aviheader.c b/demux/aviheader.c
index 0c47386dc5..a83ce1e0fb 100644
--- a/demux/aviheader.c
+++ b/demux/aviheader.c
@@ -25,10 +25,10 @@
#include <libavutil/intreadwrite.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "stheader.h"
#include "aviprint.h"
#include "aviheader.h"
diff --git a/demux/aviheader.h b/demux/aviheader.h
index 1629a33b57..f1ec64a577 100644
--- a/demux/aviheader.h
+++ b/demux/aviheader.h
@@ -23,7 +23,7 @@
#include <stdint.h>
#include "config.h"
#include "libavutil/common.h"
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
#ifndef mmioFOURCC
#define mmioFOURCC( ch0, ch1, ch2, ch3 ) \
diff --git a/demux/aviprint.c b/demux/aviprint.c
index e7520a42c5..5d285c2104 100644
--- a/demux/aviprint.c
+++ b/demux/aviprint.c
@@ -25,7 +25,7 @@
// for avi_stream_id():
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "aviheader.h"
#include "ms_hdr.h"
diff --git a/demux/demux.c b/demux/demux.c
index 3673fd06e3..889fbea409 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -28,17 +28,16 @@
#include <sys/stat.h>
#include "config.h"
-#include "options.h"
+#include "core/options.h"
#include "talloc.h"
-#include "mp_msg.h"
-#include "m_config.h"
+#include "core/mp_msg.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "stheader.h"
#include "mf.h"
-#include "libaf/format.h"
+#include "audio/format.h"
#include "libavcodec/avcodec.h"
#if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE
diff --git a/demux/demux.h b/demux/demux.h
index f44c728c1e..4ab4581b2a 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -25,8 +25,8 @@
#include <string.h>
#include <stdbool.h>
-#include "bstr.h"
-#include "mpcommon.h"
+#include "core/bstr.h"
+#include "core/mp_common.h"
#include "demux_packet.h"
#include "stheader.h"
diff --git a/demux/demux_asf.c b/demux/demux_asf.c
index 9d189ef095..010aad4677 100644
--- a/demux/demux_asf.c
+++ b/demux/demux_asf.c
@@ -27,13 +27,13 @@
#include <libavutil/intreadwrite.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream/stream.h"
#include "asf.h"
#include "asfheader.h"
-#include "demuxer.h"
-#include "libmpcodecs/dec_audio.h"
+#include "demux.h"
+#include "audio/decode/dec_audio.h"
// based on asf file-format doc by Eugene [http://divx.euro.ru]
diff --git a/demux/demux_avi.c b/demux/demux_avi.c
index 887494c6cd..9842c1c10c 100644
--- a/demux/demux_avi.c
+++ b/demux/demux_avi.c
@@ -24,10 +24,10 @@
#include <unistd.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "stheader.h"
#include "aviheader.h"
diff --git a/demux/demux_cue.c b/demux/demux_cue.c
index d2fd06ce71..31a3e00e40 100644
--- a/demux/demux_cue.c
+++ b/demux/demux_cue.c
@@ -20,8 +20,8 @@
#include <stdbool.h>
#include <string.h>
-#include "bstr.h"
-#include "demuxer.h"
+#include "core/bstr.h"
+#include "demux.h"
#include "stream/stream.h"
// timeline/tl_cue.c
diff --git a/demux/demux_edl.c b/demux/demux_edl.c
index 4c864cfe42..1e1db5be93 100644
--- a/demux/demux_edl.c
+++ b/demux/demux_edl.c
@@ -20,7 +20,7 @@
#include <stdbool.h>
#include <string.h>
-#include "demuxer.h"
+#include "demux.h"
#include "stream/stream.h"
static int try_open_file(struct demuxer *demuxer)
diff --git a/demux/demux_gif.c b/demux/demux_gif.c
index 18bf9abfd7..cd82609ee4 100644
--- a/demux/demux_gif.c
+++ b/demux/demux_gif.c
@@ -26,14 +26,15 @@
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "stheader.h"
+#include "video/memcpy_pic.h"
#include <gif_lib.h>
-#include "libvo/fastmemcpy.h"
+
typedef struct {
int current_pts;
unsigned char *palette;
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 35f3f6a83e..a411441873 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -32,19 +32,19 @@
#include <libavutil/avstring.h>
#include <libavutil/mathematics.h>
#include <libavutil/opt.h>
-#include "libav_compat.h"
+#include "compat/libav.h"
#include "config.h"
-#include "options.h"
-#include "mp_msg.h"
-#include "av_opts.h"
-#include "bstr.h"
+#include "core/options.h"
+#include "core/mp_msg.h"
+#include "core/av_opts.h"
+#include "core/bstr.h"
#include "stream/stream.h"
#include "aviprint.h"
-#include "demuxer.h"
+#include "demux.h"
#include "stheader.h"
-#include "m_option.h"
+#include "core/m_option.h"
#include "mp_taglists.h"
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 6f0f0de897..fdfa21c4a3 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -27,10 +27,10 @@
#include "talloc.h"
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "stheader.h"
#include "mf.h"
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 3093fcae0f..528d086e81 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -39,16 +39,16 @@
#endif
#include "talloc.h"
-#include "options.h"
-#include "bstr.h"
+#include "core/options.h"
+#include "core/bstr.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "stheader.h"
#include "ebml.h"
#include "matroska.h"
//#include "demux_real.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
static const unsigned char sipr_swaps[38][2] = {
{0,63},{1,22},{2,44},{3,90},{5,81},{7,31},{8,86},{9,58},{10,36},{12,68},
diff --git a/demux/demux_mng.c b/demux/demux_mng.c
index ad08ba8c4b..1d21d9d218 100644
--- a/demux/demux_mng.c
+++ b/demux/demux_mng.c
@@ -26,12 +26,12 @@
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "stheader.h"
-#include "libmpcodecs/img_format.h"
+#include "video/img_format.h"
#define MNG_SUPPORT_READ
#define MNG_SUPPORT_DISPLAY
diff --git a/demux/demux_mpg.c b/demux/demux_mpg.c
index 44ec85d2db..7c943a87b1 100644
--- a/demux/demux_mpg.c
+++ b/demux/demux_mpg.c
@@ -25,13 +25,13 @@
#include <math.h>
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
#include "libavutil/attributes.h"
-#include "libmpcodecs/dec_audio.h"
+#include "audio/decode/dec_audio.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "parse_es.h"
#include "stheader.h"
#include "mp3_hdr.h"
diff --git a/demux/demux_rawaudio.c b/demux/demux_rawaudio.c
index 2a8fea05f0..2551e2794a 100644
--- a/demux/demux_rawaudio.c
+++ b/demux/demux_rawaudio.c
@@ -23,12 +23,12 @@
#include <unistd.h>
#include <string.h>
-#include "m_option.h"
+#include "core/m_option.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "stheader.h"
-#include "libaf/format.h"
+#include "audio/format.h"
static int channels = 2;
diff --git a/demux/demux_rawvideo.c b/demux/demux_rawvideo.c
index e84caafd01..197c48a454 100644
--- a/demux/demux_rawvideo.c
+++ b/demux/demux_rawvideo.c
@@ -23,13 +23,13 @@
#include <unistd.h>
#include <string.h>
-#include "m_option.h"
+#include "core/m_option.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "stheader.h"
-#include "libmpcodecs/img_format.h"
+#include "video/img_format.h"
static int format = IMGFMT_I420;
static int size_id = 0;
diff --git a/demux/demux_ts.c b/demux/demux_ts.c
index b59066327d..a28f177f8e 100644
--- a/demux/demux_ts.c
+++ b/demux/demux_ts.c
@@ -27,12 +27,12 @@
#include <string.h>
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
-#include "libmpcodecs/dec_audio.h"
+#include "audio/decode/dec_audio.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "parse_es.h"
#include "stheader.h"
#include "ms_hdr.h"
diff --git a/demux/ebml.c b/demux/ebml.c
index fba8177805..3d1da44e58 100644
--- a/demux/ebml.c
+++ b/demux/ebml.c
@@ -34,8 +34,8 @@
#include "talloc.h"
#include "ebml.h"
#include "stream/stream.h"
-#include "mpbswap.h"
-#include "mp_msg.h"
+#include "compat/mpbswap.h"
+#include "core/mp_msg.h"
#ifndef SIZE_MAX
#define SIZE_MAX ((size_t)-1)
diff --git a/demux/ebml.h b/demux/ebml.h
index 866e620c61..492144e5b7 100644
--- a/demux/ebml.h
+++ b/demux/ebml.h
@@ -24,7 +24,7 @@
#include <stdbool.h>
#include "stream/stream.h"
-#include "bstr.h"
+#include "core/bstr.h"
/* EBML version supported */
diff --git a/demux/extension.c b/demux/extension.c
index 6845c36af3..71b5bf8f4d 100644
--- a/demux/extension.c
+++ b/demux/extension.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
/*
* An autodetection based on the extension is not a good idea, but we don't care ;-)
@@ -31,7 +31,7 @@
* You should not add anything here where autodetection can be easily fixed except in
* order to speed up auto-detection, in particular for formats that are often streamed.
* In particular you should not normally add any DEMUXER_TYPE_LAVF, adding the
- * format to preferred_list in libmpdemux/demuxer_lavf.c will usually achieve
+ * format to preferred_list in demux/demuxer_lavf.c will usually achieve
* the same effect in a much more reliable way.
*/
static struct {
diff --git a/demux/mf.c b/demux/mf.c
index d232944593..440156087e 100644
--- a/demux/mf.c
+++ b/demux/mf.c
@@ -37,9 +37,9 @@
#endif
#include "osdep/strsep.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream/stream.h"
-#include "path.h"
+#include "core/path.h"
#include "mf.h"
diff --git a/demux/mp3_hdr.c b/demux/mp3_hdr.c
index a4834f4f81..27a02368da 100644
--- a/demux/mp3_hdr.c
+++ b/demux/mp3_hdr.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "mp3_hdr.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
//----------------------- mp3 audio frame header parser -----------------------
diff --git a/demux/mpeg_hdr.c b/demux/mpeg_hdr.c
index 0c368aa7a2..fcc4a33ecc 100644
--- a/demux/mpeg_hdr.c
+++ b/demux/mpeg_hdr.c
@@ -26,7 +26,7 @@
#include "config.h"
#include "mpeg_hdr.h"
#include "libavutil/attributes.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
static float frameratecode2framerate[16] = {
0,
diff --git a/demux/parse_es.c b/demux/parse_es.c
index 05507a495a..8e43446c1f 100644
--- a/demux/parse_es.c
+++ b/demux/parse_es.c
@@ -24,10 +24,10 @@
#include <unistd.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "parse_es.h"
//static unsigned char videobuffer[MAX_VIDEO_PACKET_SIZE];
diff --git a/demux/parse_es.h b/demux/parse_es.h
index ed76593e50..af558e379d 100644
--- a/demux/parse_es.h
+++ b/demux/parse_es.h
@@ -21,7 +21,7 @@
#include <stdint.h>
-#include "demuxer.h"
+#include "demux.h"
#define MAX_VIDEO_PACKET_SIZE (224*1024+4)
#define VIDEOBUFFER_SIZE 0x100000
diff --git a/demux/video.c b/demux/video.c
index 11e512f119..089bc852b4 100644
--- a/demux/video.c
+++ b/demux/video.c
@@ -27,10 +27,10 @@
#include <libavutil/mem.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream/stream.h"
-#include "demuxer.h"
+#include "demux.h"
#include "stheader.h"
#include "parse_es.h"
#include "mpeg_hdr.h"
diff --git a/osdep/cocoa_events.h b/osdep/cocoa_events.h
index 3f0e775e03..99f761e244 100644
--- a/osdep/cocoa_events.h
+++ b/osdep/cocoa_events.h
@@ -20,7 +20,7 @@
#ifndef MPLAYER_COCOA_EVENTS_H
#define MPLAYER_COCOA_EVENTS_H
-#include "input/input.h"
+#include "core/input/input.h"
void cocoa_events_init(struct input_ctx *ictx,
void (*read_all_fd_events)(struct input_ctx *ictx, int time));
diff --git a/osdep/cocoa_events.m b/osdep/cocoa_events.m
index e6d941d19b..e96d2e3cea 100644
--- a/osdep/cocoa_events.m
+++ b/osdep/cocoa_events.m
@@ -35,7 +35,7 @@
*/
#include "cocoa_events.h"
-#include "libvo/cocoa_common.h"
+#include "video/out/cocoa_common.h"
#include "talloc.h"
#import <Cocoa/Cocoa.h>
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index de886182c9..c7607cee47 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -28,9 +28,9 @@
#include <stdint.h>
#include <string.h>
#include <windows.h>
-#include "input/keycodes.h"
-#include "input/input.h"
-#include "mp_fifo.h"
+#include "core/input/keycodes.h"
+#include "core/input/input.h"
+#include "core/mp_fifo.h"
#include "getch2.h"
int mp_input_slave_cmd_func(int fd,char* dest,int size){
diff --git a/osdep/getch2.c b/osdep/getch2.c
index 6b41514a9e..c722922f88 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -53,9 +53,9 @@
#include <unistd.h>
#include <fcntl.h>
-#include "bstr.h"
-#include "mp_fifo.h"
-#include "input/keycodes.h"
+#include "core/bstr.h"
+#include "core/mp_fifo.h"
+#include "core/input/keycodes.h"
#include "getch2.h"
#ifdef HAVE_TERMIOS
diff --git a/osdep/macosx_finder_args.h b/osdep/macosx_finder_args.h
index 3b0460cd0b..33a2936f05 100644
--- a/osdep/macosx_finder_args.h
+++ b/osdep/macosx_finder_args.h
@@ -20,7 +20,7 @@
#define MPLAYER_MACOSX_FINDER_ARGS_H
#include <stdbool.h>
-#include "m_config.h"
+#include "core/m_config.h"
struct playlist;
bool macosx_finder_args(m_config_t *config, struct playlist *files,
diff --git a/osdep/macosx_finder_args.m b/osdep/macosx_finder_args.m
index a3eae773fd..e9038deaed 100644
--- a/osdep/macosx_finder_args.m
+++ b/osdep/macosx_finder_args.m
@@ -20,7 +20,7 @@
#import <ApplicationServices/ApplicationServices.h>
#include <stdio.h>
#include "talloc.h"
-#include "playlist.h"
+#include "core/playlist.h"
#include "macosx_finder_args.h"
static struct playlist *files = NULL;
diff --git a/osdep/priority.c b/osdep/priority.c
index dfa2c54ff5..81e9f6689f 100644
--- a/osdep/priority.c
+++ b/osdep/priority.c
@@ -26,7 +26,7 @@
#include <string.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "priority.h"
diff --git a/osdep/shmem.c b/osdep/shmem.c
index 56b5b301b5..5fc7db19d3 100644
--- a/osdep/shmem.c
+++ b/osdep/shmem.c
@@ -38,7 +38,7 @@
#include <fcntl.h>
#include <inttypes.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#ifdef AIX
#include <sys/select.h>
diff --git a/osdep/timer-darwin.c b/osdep/timer-darwin.c
index 13dcb104b7..1ce9cd584b 100644
--- a/osdep/timer-darwin.c
+++ b/osdep/timer-darwin.c
@@ -24,7 +24,7 @@
#include <mach/mach_time.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "timer.h"
/* global variables */
diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c
index 412e87ce05..12ffa133f2 100644
--- a/stream/ai_alsa1x.c
+++ b/stream/ai_alsa1x.c
@@ -25,7 +25,7 @@
#include <alsa/asoundlib.h>
#include "audio_in.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
int ai_alsa_setup(audio_in_t *ai)
{
diff --git a/stream/ai_oss.c b/stream/ai_oss.c
index 656b45b5ac..be55358288 100644
--- a/stream/ai_oss.c
+++ b/stream/ai_oss.c
@@ -37,7 +37,7 @@
#endif
#include "audio_in.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
int ai_oss_set_samplerate(audio_in_t *ai)
{
diff --git a/stream/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c
index 3af97b148b..26dd8aeddf 100644
--- a/stream/asf_mmst_streaming.c
+++ b/stream/asf_mmst_streaming.c
@@ -35,8 +35,8 @@
#include <inttypes.h>
#include "config.h"
-#include "options.h"
-#include "mp_msg.h"
+#include "core/options.h"
+#include "core/mp_msg.h"
#if HAVE_WINSOCK2_H
#include <winsock2.h>
@@ -47,7 +47,7 @@
#endif
#include "url.h"
-#include "libmpdemux/asf.h"
+#include "demux/asf.h"
#include "stream.h"
#include "asf_mmst_streaming.h"
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c
index 8c747abfdf..f81b5dd983 100644
--- a/stream/asf_streaming.c
+++ b/stream/asf_streaming.c
@@ -26,8 +26,8 @@
#include <libavutil/intreadwrite.h>
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
#if HAVE_WINSOCK2_H
#include <winsock2.h>
@@ -35,15 +35,15 @@
#include "url.h"
#include "http.h"
-#include "libmpdemux/asf.h"
+#include "demux/asf.h"
#include "stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
#include "asf_mmst_streaming.h"
#include "network.h"
#include "tcp.h"
-#include "libmpdemux/asfguid.h"
+#include "demux/asfguid.h"
extern int network_bandwidth;
diff --git a/stream/audio_in.c b/stream/audio_in.c
index b7d388d89d..7f6a43fa2e 100644
--- a/stream/audio_in.c
+++ b/stream/audio_in.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "audio_in.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include <string.h>
#include <errno.h>
diff --git a/stream/cache2.c b/stream/cache2.c
index d9c4fbb09d..b6df32821e 100644
--- a/stream/cache2.c
+++ b/stream/cache2.c
@@ -57,11 +57,11 @@ static void *ThreadProc(void *s);
#define FORKED_CACHE 0
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
#include "cache2.h"
-#include "mpcommon.h"
+#include "core/mp_common.h"
typedef struct {
// constats:
diff --git a/stream/cdinfo.c b/stream/cdinfo.c
index 3ec5560a24..82ff6d4169 100644
--- a/stream/cdinfo.c
+++ b/stream/cdinfo.c
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "cdd.h"
/*******************************************************************************************************************
diff --git a/stream/cookies.c b/stream/cookies.c
index 6a1ad4466d..d4ae1afab0 100644
--- a/stream/cookies.c
+++ b/stream/cookies.c
@@ -35,7 +35,7 @@
#include "cookies.h"
#include "http.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#define MAX_COOKIES 20
diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c
index 8730c582a0..d5ea8c7b1a 100644
--- a/stream/dvb_tune.c
+++ b/stream/dvb_tune.c
@@ -37,7 +37,7 @@
#include "config.h"
#include "dvbin.h"
#include "dvb_tune.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
diff --git a/stream/http.c b/stream/http.c
index e88b0bd468..a6d977c10a 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -35,10 +35,10 @@
#include "http.h"
#include "url.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
#include "network.h"
#include "libavutil/base64.h"
diff --git a/stream/network.c b/stream/network.c
index 572114a806..f80017e75b 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -29,9 +29,9 @@
#include <ctype.h>
#include "config.h"
-#include "options.h"
+#include "core/options.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#if HAVE_WINSOCK2_H
#include <winsock2.h>
@@ -39,9 +39,8 @@
#endif
#include "stream.h"
-#include "libmpdemux/demuxer.h"
-#include "m_config.h"
-#include "mpcommon.h"
+#include "demux/demux.h"
+#include "core/mp_common.h"
#include "network.h"
#include "tcp.h"
#include "http.h"
diff --git a/stream/stream.c b/stream/stream.c
index 8ae334880b..d1dcc11dc0 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -41,15 +41,15 @@
#include <winsock2.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "osdep/shmem.h"
#include "osdep/timer.h"
#include "network.h"
#include "stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "cache2.h"
diff --git a/stream/stream.h b/stream/stream.h
index 9416e42ca8..ace35abd9a 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -20,7 +20,7 @@
#define MPLAYER_STREAM_H
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "url.h"
#include <stdio.h>
#include <string.h>
@@ -28,7 +28,7 @@
#include <sys/types.h>
#include <fcntl.h>
-#include "bstr.h"
+#include "core/bstr.h"
#ifndef O_BINARY
#define O_BINARY 0
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index a126661e30..432216e20e 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -33,11 +33,11 @@
#include "config.h"
#include "libavutil/common.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
#include "talloc.h"
-#include "mp_msg.h"
-#include "m_struct.h"
-#include "m_option.h"
+#include "core/mp_msg.h"
+#include "core/m_struct.h"
+#include "core/m_option.h"
#include "stream.h"
#define BLURAY_SECTOR_SIZE 6144
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index a014ad14c4..31e29a343f 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -29,15 +29,15 @@
#include "talloc.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "libavutil/common.h"
-#include "mpbswap.h"
-#include "libmpdemux/demuxer.h"
+#include "compat/mpbswap.h"
+#include "demux/demux.h"
#include "cdd.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
extern char *cdrom_device;
diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c
index 76fdaa95b8..2fc4335b68 100644
--- a/stream/stream_cddb.c
+++ b/stream/stream_cddb.c
@@ -49,8 +49,8 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "mp_msg.h"
-#include "path.h"
+#include "core/mp_msg.h"
+#include "core/path.h"
#if defined(__linux__)
#include <linux/cdrom.h>
@@ -63,11 +63,11 @@
#elif defined(__APPLE__) || defined(__DARWIN__)
#include <IOKit/storage/IOCDTypes.h>
#include <IOKit/storage/IOCDMediaBSDClient.h>
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
#endif
#include "cdd.h"
-#include "mpcommon.h"
+#include "core/mp_common.h"
#include "stream.h"
#include "network.h"
#include "libavutil/common.h"
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 13f32c29a8..6a73e5db42 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -40,10 +40,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <errno.h>
#include "stream.h"
-#include "libmpdemux/demuxer.h"
-#include "m_option.h"
-#include "m_struct.h"
-#include "path.h"
+#include "demux/demux.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
+#include "core/path.h"
#include "libavutil/avstring.h"
#include "dvbin.h"
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 689e773c9d..a45fa4e432 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -25,7 +25,7 @@
#include "config.h"
#include "talloc.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include <libgen.h>
#include <errno.h>
@@ -36,12 +36,12 @@
#define FIRST_PCM_AID 160
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "stream_dvd.h"
#include "stream_dvd_common.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
static char* dvd_device_current;
int dvd_angle=1;
diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h
index ff6cb771d2..984d545467 100644
--- a/stream/stream_dvd.h
+++ b/stream/stream_dvd.h
@@ -26,7 +26,7 @@
#include <dvdread/ifo_read.h>
#include <dvdread/nav_read.h>
#include "stream.h"
-#include "m_option.h"
+#include "core/m_option.h"
typedef struct {
dvd_reader_t *dvd;
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c
index db566e5136..bc4c600c36 100644
--- a/stream/stream_dvd_common.c
+++ b/stream/stream_dvd_common.c
@@ -39,7 +39,7 @@
#include <sys/ioctl.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream_dvd_common.h"
const char * const dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" };
diff --git a/stream/stream_file.c b/stream/stream_file.c
index 20d2a85497..abf0b37855 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -27,10 +27,10 @@
#include "osdep/io.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
static struct stream_priv_s {
char* filename;
diff --git a/stream/stream_ftp.c b/stream/stream_ftp.c
index 53b9e945d1..90ccc7b13a 100644
--- a/stream/stream_ftp.c
+++ b/stream/stream_ftp.c
@@ -32,11 +32,11 @@
#include <winsock2.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "network.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "tcp.h"
static struct stream_priv_s {
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index d62d9c9e57..d21e35e6a3 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -20,11 +20,11 @@
#include "libavformat/avformat.h"
#include "libavformat/avio.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
-#include "libmpdemux/demuxer.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
+#include "demux/demux.h"
static int fill_buffer(stream_t *s, char *buffer, int max_len)
{
diff --git a/stream/stream_mf.c b/stream/stream_mf.c
index 17fcf344f8..9b8b47188a 100644
--- a/stream/stream_mf.c
+++ b/stream/stream_mf.c
@@ -26,7 +26,7 @@
#include <string.h>
#include "stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
static int
mf_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c
index 6240aa7044..bbc8c85cbf 100644
--- a/stream/stream_netstream.c
+++ b/stream/stream_netstream.c
@@ -50,12 +50,12 @@
#include <winsock2.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "libavutil/common.h"
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
#include "network.h"
#include "stream_netstream.h"
diff --git a/stream/stream_netstream.h b/stream/stream_netstream.h
index 3843ee938d..5d219e3a7e 100644
--- a/stream/stream_netstream.h
+++ b/stream/stream_netstream.h
@@ -33,8 +33,8 @@
#if !HAVE_WINSOCK2_H
#include <sys/socket.h>
#endif
-#include "mp_msg.h"
-#include "mpbswap.h"
+#include "core/mp_msg.h"
+#include "compat/mpbswap.h"
typedef struct mp_net_stream_packet_st {
uint16_t len;
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index 7991395854..aeea46cf62 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -40,7 +40,7 @@
#include <linux/types.h>
#include <linux/videodev2.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
#include "pvr.h"
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index 245f889bbe..c126aba170 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -53,10 +53,10 @@
#include "stream.h"
-#include "libmpdemux/demuxer.h"
-#include "m_struct.h"
-#include "m_option.h"
-#include "mp_msg.h"
+#include "demux/demux.h"
+#include "core/m_struct.h"
+#include "core/m_option.h"
+#include "core/mp_msg.h"
#include "stream_radio.h"
#include "libavutil/avstring.h"
diff --git a/stream/stream_smb.c b/stream/stream_smb.c
index f176bc7518..e2f77ce3a1 100644
--- a/stream/stream_smb.c
+++ b/stream/stream_smb.c
@@ -21,10 +21,10 @@
#include <libsmbclient.h>
#include <unistd.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
static struct stream_priv_s {
} stream_priv_dflts = {
diff --git a/stream/stream_tv.c b/stream/stream_tv.c
index 0f454663ca..0a519efb25 100644
--- a/stream/stream_tv.c
+++ b/stream/stream_tv.c
@@ -26,9 +26,9 @@
#include <string.h>
#include "stream.h"
-#include "libmpdemux/demuxer.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "demux/demux.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "tv.h"
#include <stdio.h>
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c
index 0dae3731fb..8093088456 100644
--- a/stream/stream_vcd.c
+++ b/stream/stream_vcd.c
@@ -22,10 +22,10 @@
#include <windows.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include <fcntl.h>
#include <stdlib.h>
@@ -47,7 +47,7 @@
#include "vcd_read.h"
#endif
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
extern char *cdrom_device;
diff --git a/stream/stream_vstream.c b/stream/stream_vstream.c
index 380b682c46..790ba1b83f 100644
--- a/stream/stream_vstream.c
+++ b/stream/stream_vstream.c
@@ -42,10 +42,10 @@
#include <inttypes.h>
#include <errno.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "tcp.h"
#include <vstream-client.h>
diff --git a/stream/tcp.c b/stream/tcp.c
index 1f93571b55..54ebf33e61 100644
--- a/stream/tcp.c
+++ b/stream/tcp.c
@@ -33,7 +33,7 @@
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#if !HAVE_WINSOCK2_H
#include <netdb.h>
diff --git a/stream/tv.c b/stream/tv.c
index b0abad6e6d..922fa5f008 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -35,14 +35,14 @@
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
+#include "demux/demux.h"
+#include "demux/stheader.h"
-#include "libaf/format.h"
-#include "libmpcodecs/img_format.h"
+#include "audio/format.h"
+#include "video/img_format.h"
#include "libavutil/avstring.h"
#include "osdep/timer.h"
diff --git a/stream/tv.h b/stream/tv.h
index 699033664b..178c23563c 100644
--- a/stream/tv.h
+++ b/stream/tv.h
@@ -25,7 +25,7 @@
#ifndef MPLAYER_TV_H
#define MPLAYER_TV_H
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
typedef struct tv_param_s {
char *freq;
diff --git a/stream/tvi_bsdbt848.c b/stream/tvi_bsdbt848.c
index 0286c0ed05..19d68dd899 100644
--- a/stream/tvi_bsdbt848.c
+++ b/stream/tvi_bsdbt848.c
@@ -78,10 +78,10 @@
#endif
#endif
-#include "libaf/format.h"
-#include "libmpcodecs/img_format.h"
+#include "audio/format.h"
+#include "video/img_format.h"
#include "tv.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
static tvi_handle_t *tvi_init_bsdbt848(tv_param_t* tv_param);
/* information about this file */
diff --git a/stream/tvi_def.h b/stream/tvi_def.h
index b0fd24e130..367f2adb35 100644
--- a/stream/tvi_def.h
+++ b/stream/tvi_def.h
@@ -21,7 +21,7 @@
#include <stdlib.h> /* malloc */
#include <string.h> /* memset */
-#include "libmpcodecs/img_format.h"
+#include "video/img_format.h"
#include "tv.h"
static int init(priv_t *priv);
diff --git a/stream/tvi_dummy.c b/stream/tvi_dummy.c
index 95c9489070..48a745450e 100644
--- a/stream/tvi_dummy.c
+++ b/stream/tvi_dummy.c
@@ -21,7 +21,7 @@
#include "config.h"
#include <stdio.h>
-#include "libmpcodecs/img_format.h"
+#include "video/img_format.h"
#include "tv.h"
static tvi_handle_t *tvi_init_dummy(tv_param_t* tv_param);
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c
index 4a5a2d4141..14313d0966 100644
--- a/stream/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
@@ -55,9 +55,9 @@ known issues:
#include <linux/types.h>
#include <linux/videodev2.h>
#endif
-#include "mp_msg.h"
-#include "libmpcodecs/img_format.h"
-#include "libaf/format.h"
+#include "core/mp_msg.h"
+#include "video/img_format.h"
+#include "audio/format.h"
#include "tv.h"
#include "audio_in.h"
diff --git a/stream/udp.c b/stream/udp.c
index e27808b4c2..53a581e332 100644
--- a/stream/udp.c
+++ b/stream/udp.c
@@ -41,7 +41,7 @@
#include <ws2tcpip.h>
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "network.h"
#include "url.h"
#include "udp.h"
diff --git a/stream/url.c b/stream/url.c
index 9114468388..7919a356f1 100644
--- a/stream/url.c
+++ b/stream/url.c
@@ -28,7 +28,7 @@
#include <inttypes.h>
#include "url.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#ifndef SIZE_MAX
#define SIZE_MAX ((size_t)-1)
diff --git a/stream/vcd_read.h b/stream/vcd_read.h
index ed435e3317..9d0f68ea66 100644
--- a/stream/vcd_read.h
+++ b/stream/vcd_read.h
@@ -26,7 +26,7 @@
#include <libavutil/intreadwrite.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "stream.h"
//=================== VideoCD ==========================
#if defined(__linux__) || defined(sun) || defined(__bsdi__)
diff --git a/stream/vcd_read_darwin.h b/stream/vcd_read_darwin.h
index 71fc093984..87087e3107 100644
--- a/stream/vcd_read_darwin.h
+++ b/stream/vcd_read_darwin.h
@@ -32,8 +32,8 @@
#include <IOKit/storage/IOCDTypes.h>
#include <IOKit/storage/IOCDMedia.h>
#include <IOKit/storage/IOCDMediaBSDClient.h>
-#include "mpbswap.h"
-#include "mp_msg.h"
+#include "compat/mpbswap.h"
+#include "core/mp_msg.h"
#include "stream.h"
//=================== VideoCD ==========================
diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h
index 406cb902da..29dae1762a 100644
--- a/stream/vcd_read_fbsd.h
+++ b/stream/vcd_read_fbsd.h
@@ -41,7 +41,7 @@
#define TOCADDR(te) ((te).entry.addr)
#define READ_TOC CDIOREADTOCENTRY
#endif
-#include "mp_msg.h"
+#include "core/mp_msg.h"
//=================== VideoCD ==========================
#define CDROM_LEADOUT 0xAA
diff --git a/stream/vcd_read_win32.h b/stream/vcd_read_win32.h
index 2e13232606..30679d707e 100644
--- a/stream/vcd_read_win32.h
+++ b/stream/vcd_read_win32.h
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include <ddk/ntddcdrm.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
typedef struct mp_vcd_priv_st mp_vcd_priv_t;
diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index 1867880f38..503bd23188 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -30,13 +30,13 @@
#include <libavutil/common.h>
#include "config.h"
-#include "mp_msg.h"
-#include "path.h"
+#include "core/mp_msg.h"
+#include "core/path.h"
#include "ass_mp.h"
#include "subreader.h"
#include "sub/sub.h"
#include "stream/stream.h"
-#include "options.h"
+#include "core/options.h"
ASS_Track *mp_ass_default_track(ASS_Library *library, struct MPOpts *opts)
{
diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index 5ceb3b2422..4e703e7dc0 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -21,11 +21,11 @@
#include <assert.h>
#include "config.h"
-#include "libmpdemux/stheader.h"
+#include "demux/stheader.h"
#include "sub/sd.h"
#include "sub/sub.h"
#include "sub/dec_sub.h"
-#include "options.h"
+#include "core/options.h"
extern const struct sd_functions sd_ass;
extern const struct sd_functions sd_lavc;
diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c
index 9a72a5b738..e578bd0fcf 100644
--- a/sub/draw_bmp.c
+++ b/sub/draw_bmp.c
@@ -24,13 +24,13 @@
#include <libavutil/common.h>
-#include "mpcommon.h"
+#include "core/mp_common.h"
#include "sub/draw_bmp.h"
#include "sub/sub.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/sws_utils.h"
-#include "libmpcodecs/img_format.h"
-#include "libvo/csputils.h"
+#include "video/mp_image.h"
+#include "video/sws_utils.h"
+#include "video/img_format.h"
+#include "video/csputils.h"
const bool mp_draw_sub_formats[SUBBITMAP_COUNT] = {
[SUBBITMAP_LIBASS] = true,
diff --git a/sub/find_sub.c b/sub/find_sub.c
index 97c232b1db..5feef2a3e9 100644
--- a/sub/find_sub.c
+++ b/sub/find_sub.c
@@ -22,13 +22,12 @@
#include <stdio.h>
-#include "libvo/video_out.h"
#include "sub.h"
#include "subreader.h"
-#include "mp_msg.h"
-#include "mpcommon.h"
-#include "mplayer.h"
+#include "core/mp_msg.h"
+#include "core/mp_common.h"
+#include "core/mplayer.h"
static int current_sub=0;
diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c
index 2e705bd4d1..502fc911dc 100644
--- a/sub/find_subfiles.c
+++ b/sub/find_subfiles.c
@@ -6,10 +6,10 @@
#include "osdep/io.h"
-#include "mp_msg.h"
-#include "options.h"
-#include "path.h"
-#include "mpcommon.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
+#include "core/path.h"
+#include "core/mp_common.h"
#include "sub/find_subfiles.h"
#include "sub/sub.h"
#include "sub/subreader.h"
diff --git a/sub/img_convert.c b/sub/img_convert.c
index aa5c89401a..e2eded24c3 100644
--- a/sub/img_convert.c
+++ b/sub/img_convert.c
@@ -25,10 +25,9 @@
#include "img_convert.h"
#include "sub.h"
-#include "spudec.h"
-#include "libmpcodecs/img_format.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/sws_utils.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
+#include "video/sws_utils.h"
struct osd_conv_cache {
struct sub_bitmap part;
diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index 11173dad7a..8e7d766024 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "talloc.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "sub.h"
#include "libavutil/common.h"
@@ -32,7 +32,7 @@ static const char osd_font_pfb[] =
;
#include "sub/ass_mp.h"
-#include "mp_core.h"
+#include "core/mp_core.h"
// NOTE: \fs-5 to reduce the size of the symbols in relation to normal text.
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 8c0719658b..7473c25de1 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -23,10 +23,10 @@
#include "talloc.h"
-#include "options.h"
-#include "mpcommon.h"
-#include "mp_msg.h"
-#include "libmpdemux/stheader.h"
+#include "core/options.h"
+#include "core/mp_common.h"
+#include "core/mp_msg.h"
+#include "demux/stheader.h"
#include "sub.h"
#include "dec_sub.h"
#include "ass_mp.h"
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c
index bee224c506..fbffc175d4 100644
--- a/sub/sd_lavc.c
+++ b/sub/sd_lavc.c
@@ -21,8 +21,8 @@
#include <libavcodec/avcodec.h>
#include "talloc.h"
-#include "mp_msg.h"
-#include "libmpdemux/stheader.h"
+#include "core/mp_msg.h"
+#include "demux/stheader.h"
#include "sd.h"
#include "dec_sub.h"
#include "sub.h"
diff --git a/sub/spudec.c b/sub/spudec.c
index 003a068422..2a2bc2dde3 100644
--- a/sub/spudec.c
+++ b/sub/spudec.c
@@ -40,13 +40,13 @@
#include <libavutil/intreadwrite.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "spudec.h"
#include "vobsub.h"
#include "sub.h"
-#include "mpcommon.h"
-#include "libvo/csputils.h"
+#include "core/mp_common.h"
+#include "video/csputils.h"
typedef struct spu_packet_t packet_t;
struct spu_packet_t {
diff --git a/sub/sub.c b/sub/sub.c
index 517de35fc3..eafa2cc831 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -23,17 +23,16 @@
#include <libavutil/common.h>
-#include "mpcommon.h"
+#include "core/mp_common.h"
#include "stream/stream.h"
#include "osdep/timer.h"
#include "talloc.h"
-#include "options.h"
-#include "mplayer.h"
-#include "mp_msg.h"
-#include "libvo/video_out.h"
+#include "core/options.h"
+#include "core/mplayer.h"
+#include "core/mp_msg.h"
#include "sub.h"
#include "dec_sub.h"
#include "img_convert.h"
diff --git a/sub/subassconvert.c b/sub/subassconvert.c
index c391ad7c86..09ce94793c 100644
--- a/sub/subassconvert.c
+++ b/sub/subassconvert.c
@@ -25,9 +25,9 @@
#include <stdarg.h>
#include <stdbool.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "subassconvert.h"
-#include "bstr.h"
+#include "core/bstr.h"
#include "libavutil/common.h"
struct line {
diff --git a/sub/subreader.c b/sub/subreader.c
index 1f88b220d1..583e719e55 100644
--- a/sub/subreader.c
+++ b/sub/subreader.c
@@ -28,11 +28,11 @@
#include <dirent.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "subreader.h"
-#include "mpcommon.h"
+#include "core/mp_common.h"
#include "subassconvert.h"
-#include "options.h"
+#include "core/options.h"
#include "stream/stream.h"
#include "libavutil/common.h"
#include "libavutil/avstring.h"
diff --git a/sub/vobsub.c b/sub/vobsub.c
index ac2793062a..1643f249f0 100644
--- a/sub/vobsub.c
+++ b/sub/vobsub.c
@@ -32,11 +32,11 @@
#include <sys/types.h>
#include "config.h"
-#include "mpcommon.h"
+#include "core/mp_common.h"
#include "vobsub.h"
#include "spudec.h"
-#include "mp_msg.h"
-#include "path.h"
+#include "core/mp_msg.h"
+#include "core/path.h"
#include "libavutil/common.h"
extern int vobsub_id;
diff --git a/talloc.h b/talloc.h
index e98dbae902..bb6bd43287 100644
--- a/talloc.h
+++ b/talloc.h
@@ -29,7 +29,7 @@
#include <stdio.h>
#include <stdarg.h>
-#include "mpcommon.h"
+#include "core/mp_common.h"
/* HACK: libsmbclient uses dynamically linked libtalloc.so which has
* identically named symbols. This name collision caused a crash under
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index 5c6d3113da..5c6cfc96ce 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -17,35 +17,35 @@
*/
#include "config.h"
-#include "options.h"
+#include "core/options.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <unistd.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "osdep/timer.h"
#include "osdep/shmem.h"
#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
-#include "codec-cfg.h"
+#include "core/codec-cfg.h"
-#include "libvo/video_out.h"
-#include "libvo/csputils.h"
+#include "video/out/vo.h"
+#include "video/csputils.h"
-#include "libmpdemux/stheader.h"
-#include "vd.h"
-#include "vf.h"
+#include "demux/stheader.h"
+#include "video/decode/vd.h"
+#include "video/filter/vf.h"
-#include "dec_video.h"
+#include "video/decode/dec_video.h"
// ===================================================================
-#include "cpudetect.h"
+#include "core/cpudetect.h"
int field_dominance = -1;
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h
index f871198988..9eb90a5d5a 100644
--- a/video/decode/dec_video.h
+++ b/video/decode/dec_video.h
@@ -19,7 +19,7 @@
#ifndef MPLAYER_DEC_VIDEO_H
#define MPLAYER_DEC_VIDEO_H
-#include "libmpdemux/stheader.h"
+#include "demux/stheader.h"
struct osd_state;
diff --git a/video/decode/vd.c b/video/decode/vd.c
index 3bfc17c895..31b40e46da 100644
--- a/video/decode/vd.c
+++ b/video/decode/vd.c
@@ -21,21 +21,21 @@
#include <string.h>
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
-#include "codec-cfg.h"
+#include "core/codec-cfg.h"
-#include "img_format.h"
+#include "video/img_format.h"
#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
+#include "demux/demux.h"
+#include "demux/stheader.h"
#include "dec_video.h"
#include "vd.h"
-#include "vf.h"
-#include "libvo/video_out.h"
+#include "video/filter/vf.h"
+#include "video/out/vo.h"
extern const vd_functions_t mpcodecs_vd_ffmpeg;
diff --git a/video/decode/vd.h b/video/decode/vd.h
index 6b9803a611..2495a22dc3 100644
--- a/video/decode/vd.h
+++ b/video/decode/vd.h
@@ -19,9 +19,9 @@
#ifndef MPLAYER_VD_H
#define MPLAYER_VD_H
-#include "mp_image.h"
-#include "mpc_info.h"
-#include "libmpdemux/stheader.h"
+#include "video/mp_image.h"
+#include "core/mpc_info.h"
+#include "demux/stheader.h"
typedef struct mp_codec_info vd_info_t;
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index e078de4419..929c6c77f3 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -29,20 +29,20 @@
#include "talloc.h"
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
-#include "av_opts.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
+#include "core/av_opts.h"
-#include "mpbswap.h"
-#include "fmt-conversion.h"
+#include "compat/mpbswap.h"
+#include "video/fmt-conversion.h"
#include "vd.h"
-#include "img_format.h"
-#include "libmpdemux/stheader.h"
-#include "libmpdemux/demux_packet.h"
-#include "codec-cfg.h"
+#include "video/img_format.h"
+#include "demux/stheader.h"
+#include "demux/demux_packet.h"
+#include "core/codec-cfg.h"
#include "osdep/numcores.h"
-#include "libvo/csputils.h"
+#include "video/csputils.h"
static const vd_info_t info = {
"libavcodec video codecs",
@@ -76,7 +76,7 @@ typedef struct {
enum AVDiscard skip_frame;
} vd_ffmpeg_ctx;
-#include "m_option.h"
+#include "core/m_option.h"
static int get_buffer(AVCodecContext *avctx, AVFrame *pic);
static void release_buffer(AVCodecContext *avctx, AVFrame *pic);
diff --git a/video/filter/pullup.c b/video/filter/pullup.c
index bd25c187d6..71f34f068f 100644
--- a/video/filter/pullup.c
+++ b/video/filter/pullup.c
@@ -21,8 +21,8 @@
#include <string.h>
#include "config.h"
#include "pullup.h"
-#include "cpudetect.h"
-#include "mpcommon.h"
+#include "core/cpudetect.h"
+#include "core/mp_common.h"
diff --git a/video/filter/vf.c b/video/filter/vf.c
index 10b9fa546f..cf8866f0ac 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -26,16 +26,16 @@
#include "config.h"
-#include "mp_msg.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/mp_msg.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
extern const vf_info_t vf_info_vo;
extern const vf_info_t vf_info_crop;
diff --git a/video/filter/vf.h b/video/filter/vf.h
index 4c50f0e9cc..8f20b20466 100644
--- a/video/filter/vf.h
+++ b/video/filter/vf.h
@@ -19,12 +19,13 @@
#ifndef MPLAYER_VF_H
#define MPLAYER_VF_H
-#include "mp_image.h"
-#include "mpcommon.h"
-#include "stdbool.h"
+#include <stdbool.h>
-#include "mpc_info.h"
-#include "vfcap.h"
+#include "video/mp_image.h"
+#include "core/mp_common.h"
+
+#include "core/mpc_info.h"
+#include "video/vfcap.h"
struct MPOpts;
struct vf_instance;
diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c
index c4e0b4253b..86eb1d2140 100644
--- a/video/filter/vf_crop.c
+++ b/video/filter/vf_crop.c
@@ -21,15 +21,15 @@
#include <string.h>
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
static const struct vf_priv_s {
int crop_w,crop_h;
diff --git a/video/filter/vf_delogo.c b/video/filter/vf_delogo.c
index add6dc6b0c..f53e5059bd 100644
--- a/video/filter/vf_delogo.c
+++ b/video/filter/vf_delogo.c
@@ -28,15 +28,15 @@
#include <errno.h>
#include <math.h>
-#include "mp_msg.h"
-#include "cpudetect.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "core/mp_msg.h"
+#include "core/cpudetect.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
//===========================================================================//
diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c
index 6faeb7c411..a99bd8f96e 100644
--- a/video/filter/vf_divtc.c
+++ b/video/filter/vf_divtc.c
@@ -23,16 +23,16 @@
#include <math.h>
#include "config.h"
-#include "mp_msg.h"
-#include "cpudetect.h"
+#include "core/mp_msg.h"
+#include "core/cpudetect.h"
#include "libavutil/common.h"
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
const vf_info_t vf_info_divtc;
diff --git a/video/filter/vf_dlopen.c b/video/filter/vf_dlopen.c
index 183b31be84..8f24e2356d 100644
--- a/video/filter/vf_dlopen.c
+++ b/video/filter/vf_dlopen.c
@@ -21,14 +21,14 @@
#include <inttypes.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
#include "vf_dlopen.h"
diff --git a/video/filter/vf_down3dright.c b/video/filter/vf_down3dright.c
index 561bc898d0..64ecaffb94 100644
--- a/video/filter/vf_down3dright.c
+++ b/video/filter/vf_down3dright.c
@@ -22,14 +22,14 @@
#include <inttypes.h>
#include "config.h"
-#include "mp_msg.h"
-#include "cpudetect.h"
+#include "core/mp_msg.h"
+#include "core/cpudetect.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
struct vf_priv_s {
int skipline;
diff --git a/video/filter/vf_dsize.c b/video/filter/vf_dsize.c
index d46d22ebb2..e1c246135b 100644
--- a/video/filter/vf_dsize.c
+++ b/video/filter/vf_dsize.c
@@ -22,10 +22,10 @@
#include <inttypes.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
struct vf_priv_s {
diff --git a/video/filter/vf_eq2.c b/video/filter/vf_eq2.c
index fe4a89fb13..b39e8b087c 100644
--- a/video/filter/vf_eq2.c
+++ b/video/filter/vf_eq2.c
@@ -30,11 +30,11 @@
#include <inttypes.h>
#include "config.h"
-#include "mp_msg.h"
-#include "cpudetect.h"
+#include "core/mp_msg.h"
+#include "core/cpudetect.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
#define LUT16
diff --git a/video/filter/vf_expand.c b/video/filter/vf_expand.c
index 839820510d..7c9feb4375 100644
--- a/video/filter/vf_expand.c
+++ b/video/filter/vf_expand.c
@@ -24,17 +24,17 @@
#include <libavutil/common.h>
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
static struct vf_priv_s {
// These four values are a backup of the values parsed from the command line.
diff --git a/video/filter/vf_flip.c b/video/filter/vf_flip.c
index e8660ceb51..d5792f27ca 100644
--- a/video/filter/vf_flip.c
+++ b/video/filter/vf_flip.c
@@ -21,12 +21,12 @@
#include <string.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "mp_image.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/video_out.h"
+#include "video/out/vo.h"
//===========================================================================//
diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c
index 422956539b..ca71bb0548 100644
--- a/video/filter/vf_format.c
+++ b/video/filter/vf_format.c
@@ -22,14 +22,14 @@
#include <inttypes.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
static struct vf_priv_s {
unsigned int fmt;
diff --git a/video/filter/vf_gradfun.c b/video/filter/vf_gradfun.c
index eb73cfa2a4..b7f59f7d5c 100644
--- a/video/filter/vf_gradfun.c
+++ b/video/filter/vf_gradfun.c
@@ -36,15 +36,15 @@
#include <libavutil/common.h>
#include "config.h"
-#include "cpudetect.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "core/cpudetect.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/fastmemcpy.h"
-#include "ffmpeg_files/x86_cpu.h"
+#include "video/memcpy_pic.h"
+#include "compat/x86_cpu.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
struct vf_priv_s {
float cfg_thresh;
diff --git a/video/filter/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c
index 95cdba1ef5..ff01a6d422 100644
--- a/video/filter/vf_hqdn3d.c
+++ b/video/filter/vf_hqdn3d.c
@@ -24,9 +24,9 @@
#include <inttypes.h>
#include <math.h>
-#include "mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "core/mp_msg.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
#define PARAM1_DEFAULT 4.0
diff --git a/video/filter/vf_ilpack.c b/video/filter/vf_ilpack.c
index e98d70d85d..05eff04f26 100644
--- a/video/filter/vf_ilpack.c
+++ b/video/filter/vf_ilpack.c
@@ -22,11 +22,11 @@
#include <inttypes.h>
#include "config.h"
-#include "mp_msg.h"
-#include "cpudetect.h"
+#include "core/mp_msg.h"
+#include "core/cpudetect.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
#include "libavutil/attributes.h"
diff --git a/video/filter/vf_mirror.c b/video/filter/vf_mirror.c
index b48d9a2ef6..e201edecd1 100644
--- a/video/filter/vf_mirror.c
+++ b/video/filter/vf_mirror.c
@@ -22,10 +22,10 @@
#include <inttypes.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
diff --git a/video/filter/vf_noformat.c b/video/filter/vf_noformat.c
index b143ac0005..0da691fec2 100644
--- a/video/filter/vf_noformat.c
+++ b/video/filter/vf_noformat.c
@@ -22,14 +22,14 @@
#include <inttypes.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
static struct vf_priv_s {
unsigned int fmt;
diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c
index 87a480d655..df359833d4 100644
--- a/video/filter/vf_noise.c
+++ b/video/filter/vf_noise.c
@@ -25,13 +25,13 @@
#include <math.h>
#include "config.h"
-#include "mp_msg.h"
-#include "cpudetect.h"
+#include "core/mp_msg.h"
+#include "core/cpudetect.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
#include "libavutil/mem.h"
#define MAX_NOISE 4096
diff --git a/video/filter/vf_phase.c b/video/filter/vf_phase.c
index 568c8f1f45..74e8a1ce47 100644
--- a/video/filter/vf_phase.c
+++ b/video/filter/vf_phase.c
@@ -22,13 +22,13 @@
#include <limits.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
enum mode { PROGRESSIVE, TOP_FIRST, BOTTOM_FIRST,
TOP_FIRST_ANALYZE, BOTTOM_FIRST_ANALYZE,
diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c
index 9647032002..7ff079d1da 100644
--- a/video/filter/vf_pp.c
+++ b/video/filter/vf_pp.c
@@ -23,11 +23,11 @@
#include <errno.h>
#include "config.h"
-#include "mp_msg.h"
-#include "cpudetect.h"
+#include "core/mp_msg.h"
+#include "core/cpudetect.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
#include "libpostproc/postprocess.h"
diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c
index 97f851f348..c03d60341f 100644
--- a/video/filter/vf_pullup.c
+++ b/video/filter/vf_pullup.c
@@ -21,14 +21,14 @@
#include <string.h>
#include "config.h"
-#include "mp_msg.h"
-#include "cpudetect.h"
+#include "core/mp_msg.h"
+#include "core/cpudetect.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
#include "pullup.h"
diff --git a/video/filter/vf_rotate.c b/video/filter/vf_rotate.c
index 19eeae6d35..a59ddbc310 100644
--- a/video/filter/vf_rotate.c
+++ b/video/filter/vf_rotate.c
@@ -22,10 +22,10 @@
#include <inttypes.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
struct vf_priv_s {
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c
index 5ea62bacbd..f5a348559f 100644
--- a/video/filter/vf_scale.c
+++ b/video/filter/vf_scale.c
@@ -23,23 +23,23 @@
#include <sys/types.h>
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "fmt-conversion.h"
-#include "mpbswap.h"
+#include "video/fmt-conversion.h"
+#include "compat/mpbswap.h"
-#include "libmpcodecs/sws_utils.h"
+#include "video/sws_utils.h"
-#include "libvo/csputils.h"
+#include "video/csputils.h"
// VOFLAG_SWSCALE
-#include "libvo/video_out.h"
+#include "video/out/vo.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
static struct vf_priv_s {
int w,h;
diff --git a/video/filter/vf_screenshot.c b/video/filter/vf_screenshot.c
index 693d871e5f..8b937b0648 100644
--- a/video/filter/vf_screenshot.c
+++ b/video/filter/vf_screenshot.c
@@ -23,13 +23,13 @@
#include <string.h>
#include <inttypes.h>
-#include "mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "core/mp_msg.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libmpcodecs/sws_utils.h"
-#include "fmt-conversion.h"
-#include "libvo/fastmemcpy.h"
+#include "video/sws_utils.h"
+#include "video/fmt-conversion.h"
+#include "video/memcpy_pic.h"
#include <libswscale/swscale.h>
diff --git a/video/filter/vf_softpulldown.c b/video/filter/vf_softpulldown.c
index d07f9d6e26..80f353e548 100644
--- a/video/filter/vf_softpulldown.c
+++ b/video/filter/vf_softpulldown.c
@@ -21,13 +21,13 @@
#include <string.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
struct vf_priv_s {
int state;
diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c
index 60208cb3c6..f1b1a82409 100644
--- a/video/filter/vf_stereo3d.c
+++ b/video/filter/vf_stereo3d.c
@@ -24,17 +24,17 @@
#include <string.h>
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "m_struct.h"
-#include "m_option.h"
+#include "core/m_struct.h"
+#include "core/m_option.h"
#include "libavutil/common.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
//==types==//
typedef enum stereo_code {
diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c
index 2d5de3a7ba..12149af007 100644
--- a/video/filter/vf_sub.c
+++ b/video/filter/vf_sub.c
@@ -28,20 +28,20 @@
#include <libavutil/common.h>
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
#include "sub/sub.h"
#include "sub/dec_sub.h"
-#include "libvo/fastmemcpy.h"
-#include "libvo/csputils.h"
+#include "video/memcpy_pic.h"
+#include "video/csputils.h"
-#include "m_option.h"
-#include "m_struct.h"
+#include "core/m_option.h"
+#include "core/m_struct.h"
static const struct vf_priv_s {
int outh, outw;
diff --git a/video/filter/vf_swapuv.c b/video/filter/vf_swapuv.c
index 6edb256759..1aa0b1061f 100644
--- a/video/filter/vf_swapuv.c
+++ b/video/filter/vf_swapuv.c
@@ -24,9 +24,9 @@
#include <inttypes.h>
#include <assert.h>
-#include "mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "core/mp_msg.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
diff --git a/video/filter/vf_unsharp.c b/video/filter/vf_unsharp.c
index 69368d6bf5..4a53d0a795 100644
--- a/video/filter/vf_unsharp.c
+++ b/video/filter/vf_unsharp.c
@@ -25,13 +25,13 @@
#include <math.h>
#include "config.h"
-#include "mp_msg.h"
-#include "cpudetect.h"
+#include "core/mp_msg.h"
+#include "core/cpudetect.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
#include "libavutil/common.h"
//===========================================================================//
diff --git a/video/filter/vf_vo.c b/video/filter/vf_vo.c
index d11724f881..5c4d83c01d 100644
--- a/video/filter/vf_vo.c
+++ b/video/filter/vf_vo.c
@@ -22,13 +22,13 @@
#include <stdbool.h>
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
-#include "mp_image.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/video_out.h"
+#include "video/out/vo.h"
#include "sub/sub.h"
diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c
index bb6595cdcd..1158cffbbf 100644
--- a/video/filter/vf_yadif.c
+++ b/video/filter/vf_yadif.c
@@ -25,14 +25,14 @@
#include <math.h>
#include "config.h"
-#include "cpudetect.h"
-#include "options.h"
+#include "core/cpudetect.h"
+#include "core/options.h"
-#include "mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
+#include "core/mp_msg.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
#include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
#include "libavutil/common.h"
//===========================================================================//
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c
index 81ab7a45fb..6ce5140d58 100644
--- a/video/fmt-conversion.c
+++ b/video/fmt-conversion.c
@@ -16,10 +16,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "libavutil/avutil.h"
#include <libavutil/pixdesc.h>
-#include "libmpcodecs/img_format.h"
+#include "video/img_format.h"
#include "fmt-conversion.h"
static const struct {
diff --git a/video/image_writer.c b/video/image_writer.c
index 877c89e700..9f4ca4d2b1 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -22,6 +22,7 @@
#include <libswscale/swscale.h>
#include <libavcodec/avcodec.h>
+#include <libavutil/mem.h>
#include "config.h"
@@ -33,16 +34,14 @@
#include "image_writer.h"
#include "talloc.h"
-#include "libmpcodecs/img_format.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/dec_video.h"
-#include "libmpcodecs/vf.h"
-#include "fmt-conversion.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
+#include "video/fmt-conversion.h"
-#include "libmpcodecs/sws_utils.h"
-#include "libmpcodecs/vf.h"
+#include "video/sws_utils.h"
+#include "video/filter/vf.h"
-#include "m_option.h"
+#include "core/m_option.h"
const struct image_writer_opts image_writer_opts_defaults = {
.format = "jpg",
diff --git a/video/img_format.c b/video/img_format.c
index 1084a8f9a1..8038e82324 100644
--- a/video/img_format.c
+++ b/video/img_format.c
@@ -17,9 +17,9 @@
*/
#include "config.h"
-#include "img_format.h"
+#include "video/img_format.h"
#include "stdio.h"
-#include "mpbswap.h"
+#include "compat/mpbswap.h"
#include <string.h>
diff --git a/video/img_format.h b/video/img_format.h
index b488734f02..c32600f519 100644
--- a/video/img_format.h
+++ b/video/img_format.h
@@ -21,7 +21,7 @@
#include <sys/types.h>
#include "config.h"
-#include "bstr.h"
+#include "core/bstr.h"
/* RGB/BGR Formats */
diff --git a/video/mp_image.c b/video/mp_image.c
index c0227e4b1d..e910830a8b 100644
--- a/video/mp_image.c
+++ b/video/mp_image.c
@@ -24,11 +24,11 @@
#include "talloc.h"
-#include "libmpcodecs/img_format.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/sws_utils.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
+#include "video/sws_utils.h"
-#include "libvo/fastmemcpy.h"
+#include "video/memcpy_pic.h"
#include "libavutil/mem.h"
#include "libavutil/common.h"
diff --git a/video/mp_image.h b/video/mp_image.h
index f2d149bc9d..8ce0b98edc 100644
--- a/video/mp_image.h
+++ b/video/mp_image.h
@@ -23,8 +23,8 @@
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
-#include "mp_msg.h"
-#include "libvo/csputils.h"
+#include "core/mp_msg.h"
+#include "csputils.h"
//--------- codec's requirements (filled by the codec/vf) ---------
diff --git a/video/out/aspect.c b/video/out/aspect.c
index f3cd00a5e5..454f865d37 100644
--- a/video/out/aspect.c
+++ b/video/out/aspect.c
@@ -19,11 +19,11 @@
/* Stuff for correct aspect scaling. */
#include "aspect.h"
#include "geometry.h"
-#include "video_out.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "vo.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
-#include "video_out.h"
+#include "vo.h"
void aspect_save_videores(struct vo *vo, int w, int h, int d_w, int d_h)
{
diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c
index 603a6ce410..aae0703072 100644
--- a/video/out/bitmap_packer.c
+++ b/video/out/bitmap_packer.c
@@ -26,10 +26,10 @@
#include "talloc.h"
#include "bitmap_packer.h"
-#include "mp_msg.h"
-#include "mpcommon.h"
+#include "core/mp_msg.h"
+#include "core/mp_common.h"
#include "sub/dec_sub.h"
-#include "fastmemcpy.h"
+#include "video/memcpy_pic.h"
#define IS_POWER_OF_2(x) (((x) > 0) && !(((x) - 1) & (x)))
diff --git a/video/out/cocoa_common.h b/video/out/cocoa_common.h
index 079e497441..4227782251 100644
--- a/video/out/cocoa_common.h
+++ b/video/out/cocoa_common.h
@@ -20,7 +20,7 @@
#ifndef MPLAYER_COCOA_COMMON_H
#define MPLAYER_COCOA_COMMON_H
-#include "video_out.h"
+#include "vo.h"
struct vo_cocoa_state;
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 337e0a32be..82be8a619d 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -26,17 +26,17 @@
#include "config.h"
-#include "options.h"
-#include "video_out.h"
+#include "core/options.h"
+#include "vo.h"
#include "aspect.h"
-#include "mp_fifo.h"
+#include "core/mp_fifo.h"
#include "talloc.h"
-#include "input/input.h"
-#include "input/keycodes.h"
+#include "core/input/input.h"
+#include "core/input/keycodes.h"
#include "osx_common.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#ifndef NSOpenGLPFAOpenGLProfile
#define NSOpenGLPFAOpenGLProfile 99
diff --git a/video/out/geometry.c b/video/out/geometry.c
index 941528aea9..c90f0c9a0c 100644
--- a/video/out/geometry.c
+++ b/video/out/geometry.c
@@ -22,7 +22,7 @@
#include <string.h>
#include <limits.h>
#include "geometry.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
/* A string of the form [WxH][+X+Y] or xpos[%]:ypos[%] */
char *vo_geometry;
diff --git a/video/out/gl_common.c b/video/out/gl_common.c
index 80db2eacc4..1781233bf7 100644
--- a/video/out/gl_common.c
+++ b/video/out/gl_common.c
@@ -42,10 +42,9 @@
#include <assert.h>
#include "talloc.h"
#include "gl_common.h"
-#include "csputils.h"
#include "aspect.h"
#include "pnm_loader.h"
-#include "options.h"
+#include "core/options.h"
#include "sub/sub.h"
#include "bitmap_packer.h"
diff --git a/video/out/gl_common.h b/video/out/gl_common.h
index 9816566097..de893966df 100644
--- a/video/out/gl_common.h
+++ b/video/out/gl_common.h
@@ -28,12 +28,12 @@
#include <stdint.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
-#include "video_out.h"
-#include "csputils.h"
+#include "vo.h"
+#include "video/csputils.h"
-#include "libmpcodecs/mp_image.h"
+#include "video/mp_image.h"
#if defined(CONFIG_GL_COCOA) && !defined(CONFIG_GL_X11)
#ifdef GL_VERSION_3_0
@@ -47,7 +47,7 @@
#include <GL/glext.h>
#endif
-#include "libvo/gl_header_fixes.h"
+#include "video/out/gl_header_fixes.h"
struct GL;
typedef struct GL GL;
diff --git a/video/out/osx_common.c b/video/out/osx_common.c
index 2aa0a28126..ff2df8daff 100644
--- a/video/out/osx_common.c
+++ b/video/out/osx_common.c
@@ -20,12 +20,11 @@
// only to get keycode definitions from HIToolbox/Events.h
#include <Carbon/Carbon.h>
#include <CoreServices/CoreServices.h>
-#include "config.h"
#include "osx_common.h"
-#include "video_out.h"
-#include "input/keycodes.h"
-#include "input/input.h"
-#include "mp_msg.h"
+#include "video/out/vo.h"
+#include "core/input/keycodes.h"
+#include "core/input/input.h"
+#include "core/mp_msg.h"
/*
* Define keycodes only found in OSX >= 10.5 for older versions
diff --git a/video/out/vo.c b/video/out/vo.c
index 571f00da4d..04bd9cbb1b 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -28,17 +28,17 @@
//#include <sys/mman.h>
#include "config.h"
-#include "options.h"
+#include "core/options.h"
#include "talloc.h"
-#include "bstr.h"
-#include "video_out.h"
+#include "core/bstr.h"
+#include "vo.h"
#include "aspect.h"
#include "geometry.h"
-#include "input/input.h"
-#include "mp_fifo.h"
-#include "m_config.h"
-#include "mp_msg.h"
-#include "libmpcodecs/vfcap.h"
+#include "core/input/input.h"
+#include "core/mp_fifo.h"
+#include "core/m_config.h"
+#include "core/mp_msg.h"
+#include "video/vfcap.h"
#include "sub/sub.h"
#include "osdep/shmem.h"
diff --git a/video/out/vo.h b/video/out/vo.h
index ac2ded9b3c..71ef635050 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -26,8 +26,8 @@
#include <inttypes.h>
#include <stdbool.h>
-#include "libmpcodecs/img_format.h"
-#include "mpcommon.h"
+#include "video/img_format.h"
+#include "core/mp_common.h"
#define VO_EVENT_EXPOSE 1
#define VO_EVENT_RESIZE 2
diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c
index 2d998bf91d..63413e0e5e 100644
--- a/video/out/vo_caca.c
+++ b/video/out/vo_caca.c
@@ -35,15 +35,15 @@
#include <caca.h>
#include "config.h"
-#include "video_out.h"
+#include "vo.h"
#include "sub/sub.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/vfcap.h"
+#include "video/mp_image.h"
+#include "video/vfcap.h"
-#include "input/keycodes.h"
-#include "input/input.h"
-#include "mp_msg.h"
-#include "mp_fifo.h"
+#include "core/input/keycodes.h"
+#include "core/input/input.h"
+#include "core/mp_msg.h"
+#include "core/mp_fifo.h"
/* caca stuff */
static caca_canvas_t *canvas;
diff --git a/video/out/vo_corevideo.m b/video/out/vo_corevideo.m
index 5116ab653c..627281b4e0 100644
--- a/video/out/vo_corevideo.m
+++ b/video/out/vo_corevideo.m
@@ -24,16 +24,15 @@
#import "vo_corevideo.h"
// mplayer includes
-#import "fastmemcpy.h"
#import "talloc.h"
-#import "video_out.h"
+#import "vo.h"
#import "aspect.h"
#import "sub/sub.h"
-#import "subopt-helper.h"
+#import "core/subopt-helper.h"
-#import "csputils.h"
-#import "libmpcodecs/vfcap.h"
-#import "libmpcodecs/mp_image.h"
+#import "video/csputils.h"
+#import "video/vfcap.h"
+#import "video/mp_image.h"
#import "gl_common.h"
#import "gl_osd.h"
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 294a101ffe..f1c92d2a6e 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -27,16 +27,16 @@
#include <assert.h>
#include <d3d9.h>
#include "config.h"
-#include "options.h"
-#include "subopt-helper.h"
+#include "core/options.h"
+#include "core/subopt-helper.h"
#include "talloc.h"
-#include "video_out.h"
-#include "libmpcodecs/vfcap.h"
-#include "csputils.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/img_format.h"
-#include "fastmemcpy.h"
-#include "mp_msg.h"
+#include "vo.h"
+#include "video/vfcap.h"
+#include "video/csputils.h"
+#include "video/mp_image.h"
+#include "video/img_format.h"
+#include "video/memcpy_pic.h"
+#include "core/mp_msg.h"
#include "aspect.h"
#include "w32_common.h"
#include "libavutil/common.h"
diff --git a/video/out/vo_image.c b/video/out/vo_image.c
index 7f80a16f35..7b7c367ad4 100644
--- a/video/out/vo_image.c
+++ b/video/out/vo_image.c
@@ -25,19 +25,18 @@
#include <libswscale/swscale.h>
#include "config.h"
-#include "bstr.h"
+#include "core/bstr.h"
#include "osdep/io.h"
-#include "path.h"
+#include "core/path.h"
#include "talloc.h"
-#include "mp_msg.h"
-#include "libvo/video_out.h"
-#include "libvo/csputils.h"
-#include "libmpcodecs/vfcap.h"
-#include "libmpcodecs/mp_image.h"
-#include "fmt-conversion.h"
-#include "image_writer.h"
-#include "m_config.h"
-#include "m_option.h"
+#include "core/mp_msg.h"
+#include "video/out/vo.h"
+#include "video/csputils.h"
+#include "video/vfcap.h"
+#include "video/mp_image.h"
+#include "video/fmt-conversion.h"
+#include "video/image_writer.h"
+#include "core/m_option.h"
struct priv {
struct image_writer_opts *opts;
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c
index b86cd76509..e502e57dd2 100644
--- a/video/out/vo_lavc.c
+++ b/video/out/vo_lavc.c
@@ -22,16 +22,16 @@
#include <stdio.h>
#include <stdlib.h>
-#include "mpcommon.h"
-#include "options.h"
-#include "fmt-conversion.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/vfcap.h"
-#include "subopt-helper.h"
+#include "core/mp_common.h"
+#include "core/options.h"
+#include "video/fmt-conversion.h"
+#include "video/mp_image.h"
+#include "video/vfcap.h"
+#include "core/subopt-helper.h"
#include "talloc.h"
-#include "video_out.h"
+#include "vo.h"
-#include "encode_lavc.h"
+#include "core/encode_lavc.h"
#include "sub/sub.h"
#include "sub/dec_sub.h"
diff --git a/video/out/vo_null.c b/video/out/vo_null.c
index 1f307f7f5b..fa1c77a35a 100644
--- a/video/out/vo_null.c
+++ b/video/out/vo_null.c
@@ -25,10 +25,10 @@
#include <string.h>
#include <errno.h>
#include "config.h"
-#include "mp_msg.h"
-#include "video_out.h"
-#include "libmpcodecs/vfcap.h"
-#include "libmpcodecs/mp_image.h"
+#include "core/mp_msg.h"
+#include "vo.h"
+#include "video/vfcap.h"
+#include "video/mp_image.h"
static int draw_slice(struct vo *vo, uint8_t *image[], int stride[],
int w, int h, int x, int y)
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 7b5289838f..1900fd84a1 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -37,13 +37,13 @@
#endif
#include "talloc.h"
-#include "mpcommon.h"
-#include "bstr.h"
-#include "mp_msg.h"
-#include "subopt-helper.h"
-#include "video_out.h"
-#include "libmpcodecs/vfcap.h"
-#include "libmpcodecs/mp_image.h"
+#include "core/mp_common.h"
+#include "core/bstr.h"
+#include "core/mp_msg.h"
+#include "core/subopt-helper.h"
+#include "vo.h"
+#include "video/vfcap.h"
+#include "video/mp_image.h"
#include "geometry.h"
#include "sub/sub.h"
#include "bitmap_packer.h"
@@ -52,11 +52,11 @@
#include "gl_osd.h"
#include "filter_kernels.h"
#include "aspect.h"
-#include "fastmemcpy.h"
+#include "video/memcpy_pic.h"
static const char vo_opengl_shaders[] =
// Generated from libvo/vo_opengl_shaders.glsl
-#include "libvo/vo_opengl_shaders.h"
+#include "video/out/vo_opengl_shaders.h"
;
// Pixel width of 1D lookup textures.
diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c
index b8b1fd4813..e1695de583 100644
--- a/video/out/vo_opengl_old.c
+++ b/video/out/vo_opengl_old.c
@@ -30,18 +30,18 @@
#include "config.h"
#include "talloc.h"
-#include "mp_msg.h"
-#include "subopt-helper.h"
-#include "video_out.h"
-#include "libmpcodecs/vfcap.h"
-#include "libmpcodecs/mp_image.h"
+#include "core/mp_msg.h"
+#include "core/subopt-helper.h"
+#include "vo.h"
+#include "video/vfcap.h"
+#include "video/mp_image.h"
#include "geometry.h"
#include "sub/sub.h"
#include "gl_common.h"
#include "gl_osd.h"
#include "aspect.h"
-#include "fastmemcpy.h"
+#include "video/memcpy_pic.h"
//for gl_priv.use_yuv
#define MASK_ALL_YUV (~(1 << YUV_CONVERSION_NONE))
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c
index a523ea5815..f94531379a 100644
--- a/video/out/vo_vdpau.c
+++ b/video/out/vo_vdpau.c
@@ -39,17 +39,17 @@
#include <libavcodec/vdpau.h>
#include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
#include "talloc.h"
-#include "video_out.h"
+#include "vo.h"
#include "x11_common.h"
#include "aspect.h"
-#include "csputils.h"
+#include "video/csputils.h"
#include "sub/sub.h"
-#include "m_option.h"
-#include "libmpcodecs/vfcap.h"
-#include "libmpcodecs/mp_image.h"
+#include "core/m_option.h"
+#include "video/vfcap.h"
+#include "video/mp_image.h"
#include "osdep/timer.h"
#include "bitmap_packer.h"
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c
index 2358b0a295..f819a71a30 100644
--- a/video/out/vo_x11.c
+++ b/video/out/vo_x11.c
@@ -22,11 +22,11 @@
#include <sys/types.h>
#include "config.h"
-#include "video_out.h"
+#include "vo.h"
#include "aspect.h"
-#include "csputils.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/vfcap.h"
+#include "video/csputils.h"
+#include "video/mp_image.h"
+#include "video/vfcap.h"
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -43,11 +43,11 @@
#include "sub/sub.h"
-#include "libmpcodecs/sws_utils.h"
+#include "video/sws_utils.h"
#define MODE_RGB 0x1
#define MODE_BGR 0x2
-#include "mp_msg.h"
+#include "core/mp_msg.h"
extern int sws_flags;
diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c
index 3673764ed4..4019583914 100644
--- a/video/out/vo_xv.c
+++ b/video/out/vo_xv.c
@@ -41,18 +41,18 @@
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
-#include "options.h"
+#include "core/options.h"
#include "talloc.h"
-#include "mp_msg.h"
-#include "video_out.h"
-#include "libmpcodecs/vfcap.h"
-#include "libmpcodecs/mp_image.h"
+#include "core/mp_msg.h"
+#include "vo.h"
+#include "video/vfcap.h"
+#include "video/mp_image.h"
#include "x11_common.h"
-#include "fastmemcpy.h"
+#include "video/memcpy_pic.h"
#include "sub/sub.h"
#include "aspect.h"
-#include "csputils.h"
-#include "subopt-helper.h"
+#include "video/csputils.h"
+#include "core/subopt-helper.h"
static const vo_info_t info = {
"X11/Xv",
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index f60f5328de..3edfa97595 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -22,14 +22,14 @@
#include <windows.h>
#include <windowsx.h>
-#include "options.h"
-#include "input/keycodes.h"
-#include "input/input.h"
-#include "mp_msg.h"
-#include "video_out.h"
+#include "core/options.h"
+#include "core/input/keycodes.h"
+#include "core/input/input.h"
+#include "core/mp_msg.h"
+#include "vo.h"
#include "aspect.h"
#include "w32_common.h"
-#include "mp_fifo.h"
+#include "core/mp_fifo.h"
#include "osdep/io.h"
#include "talloc.h"
@@ -577,7 +577,7 @@ int vo_w32_config(struct vo *vo, uint32_t width, uint32_t height,
// first vo_config call; vo_config() will always set vo_dx/dy so
// that the window is centered on the screen, and this is the only
// time we actually want to use vo_dy/dy (this is not sane, and
- // video_out.h should provide a function to query the initial
+ // vo.h should provide a function to query the initial
// window position instead)
w32->window_bounds_initialized = true;
reset_size = true;
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 04d5c6880b..19094f24cd 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -23,10 +23,10 @@
#include <limits.h>
#include "config.h"
-#include "bstr.h"
-#include "options.h"
-#include "mp_msg.h"
-#include "mp_fifo.h"
+#include "core/bstr.h"
+#include "core/options.h"
+#include "core/mp_msg.h"
+#include "core/mp_fifo.h"
#include "libavutil/common.h"
#include "x11_common.h"
#include "talloc.h"
@@ -35,7 +35,7 @@
#include <unistd.h>
#include <assert.h>
-#include "video_out.h"
+#include "vo.h"
#include "aspect.h"
#include "geometry.h"
#include "osdep/timer.h"
@@ -70,11 +70,11 @@
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
-#include "subopt-helper.h"
+#include "core/subopt-helper.h"
#endif
-#include "input/input.h"
-#include "input/keycodes.h"
+#include "core/input/input.h"
+#include "core/input/keycodes.h"
#define WIN_LAYER_ONBOTTOM 2
#define WIN_LAYER_NORMAL 4
diff --git a/video/sws_utils.c b/video/sws_utils.c
index 4fc5639e55..951e101066 100644
--- a/video/sws_utils.c
+++ b/video/sws_utils.c
@@ -20,13 +20,13 @@
#include <libavutil/opt.h>
-#include "libmpcodecs/sws_utils.h"
+#include "sws_utils.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/img_format.h"
+#include "video/mp_image.h"
+#include "video/img_format.h"
#include "fmt-conversion.h"
-#include "libvo/csputils.h"
-#include "mp_msg.h"
+#include "csputils.h"
+#include "core/mp_msg.h"
//global sws_flags from the command line
int sws_flags = 2;