summaryrefslogtreecommitdiffstats
path: root/core/command.c
diff options
context:
space:
mode:
Diffstat (limited to 'core/command.c')
-rw-r--r--core/command.c31
1 files changed, 16 insertions, 15 deletions
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"