Move options/config related files from mpvcore/ to options/

Since m_option.h and options.h are extremely often included, a lot of
files have to be changed.

Moving path.c/h to options/ is a bit questionable, but since this is
mainly about access to config files (which are also handled in
options/), it's probably ok.

audio/decode/ad_lavc.c

@@ -32,7 +32,7 @@
 #include "mpvcore/av_common.h"
 #include "mpvcore/codecs.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/av_opts.h"
 
 #include "ad.h"

audio/decode/ad_spdif.c

@@ -28,7 +28,7 @@
 #include "config.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/av_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "ad.h"
 
 #define OUTBUF_SIZE 65536

audio/filter/af.c

@@ -22,8 +22,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_config.h"
+#include "options/m_option.h"
+#include "options/m_config.h"
 
 #include "af.h"
 

audio/filter/af.h

@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "audio/format.h"
 #include "audio/chmap.h"
 #include "audio/audio.h"

audio/filter/af_bs2b.c

@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "af.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 /// Internal specific data of the filter
 struct af_bs2b {

audio/filter/af_export.c

@@ -43,7 +43,7 @@
 
 #include "talloc.h"
 #include "af.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 
 #define DEF_SZ 512 // default buffer size (in samples)
 #define SHARED_FILE "mpv-af_export" /* default file name

audio/filter/af_format.c

@@ -19,7 +19,7 @@
 
 #include <libavutil/common.h>
 
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 #include "audio/format.h"
 #include "af.h"

audio/filter/af_lavfi.c

@@ -38,7 +38,7 @@
 #include "audio/fmt-conversion.h"
 #include "af.h"
 
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "mpvcore/av_opts.h"
 
 #define IS_LIBAV_FORK (LIBAVFILTER_VERSION_MICRO < 100)

audio/filter/af_lavrresample.c

@@ -55,7 +55,7 @@
 #endif
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "mpvcore/av_opts.h"
 #include "audio/filter/af.h"
 #include "audio/fmt-conversion.h"

audio/filter/af_scaletempo.c

@@ -39,7 +39,7 @@
 #include "mpvcore/mp_common.h"
 
 #include "af.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 // Data for specific instances of this filter
 typedef struct af_scaletempo_s

audio/out/ao.c

@@ -27,8 +27,8 @@
 #include "ao.h"
 #include "audio/format.h"
 
-#include "mpvcore/options.h"
-#include "mpvcore/m_config.h"
+#include "options/options.h"
+#include "options/m_config.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/mpv_global.h"
 

audio/out/ao_alsa.c

@@ -36,8 +36,8 @@
 #include <string.h>
 
 #include "config.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_option.h"
+#include "options/options.h"
+#include "options/m_option.h"
 #include "mpvcore/mp_msg.h"
 
 #define ALSA_PCM_NEW_HW_PARAMS_API

audio/out/ao_coreaudio.c

@@ -39,7 +39,7 @@
 #include "ao.h"
 #include "audio/format.h"
 #include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "mpvcore/mp_ring.h"
 #include "mpvcore/mp_msg.h"
 #include "audio/out/ao_coreaudio_properties.h"

audio/out/ao_dsound.c

@@ -41,7 +41,7 @@
 #include "audio/reorder_ch.h"
 #include "mpvcore/mp_msg.h"
 #include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 /**
 \todo use the definitions from the win32 api headers when they define these

audio/out/ao_jack.c

@@ -34,7 +34,7 @@
 #include "ao.h"
 #include "audio/format.h"
 #include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 #include "mpvcore/mp_ring.h"
 

audio/out/ao_lavc.c

@@ -30,7 +30,7 @@
 
 #include "compat/libav.h"
 #include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_common.h"
 #include "audio/format.h"
 #include "audio/fmt-conversion.h"

audio/out/ao_null.c

@@ -30,7 +30,7 @@
 
 #include "config.h"
 #include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "mpvcore/mp_msg.h"
 #include "audio/format.h"
 #include "ao.h"

audio/out/ao_openal.c

@@ -40,7 +40,7 @@
 #include "ao.h"
 #include "audio/format.h"
 #include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 #define MAX_CHANS MP_NUM_CHANNELS
 #define NUM_BUF 128

audio/out/ao_oss.c

@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_msg.h"
 
 #if HAVE_SYS_SOUNDCARD_H

audio/out/ao_pcm.c

@@ -30,7 +30,7 @@
 
 #include "talloc.h"
 
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "audio/format.h"
 #include "audio/reorder_ch.h"
 #include "ao.h"

audio/out/ao_portaudio.c

@@ -26,7 +26,7 @@
 #include <portaudio.h>
 
 #include "config.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "audio/format.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/mp_ring.h"

audio/out/ao_rsound.c

@@ -29,7 +29,7 @@
 
 #include "talloc.h"
 
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "osdep/timer.h"
 #include "audio/format.h"
 #include "ao.h"

audio/out/ao_sdl.c

@@ -24,7 +24,7 @@
 #include "talloc.h"
 #include "ao.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "osdep/timer.h"
 
 #include <libavutil/fifo.h>

audio/out/ao_sndio.c

@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <sndio.h>
 
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "mpvcore/mp_msg.h"
 
 #include "audio/format.h"

audio/out/ao_wasapi.c

@@ -30,7 +30,7 @@
 #include <avrt.h>
 
 #include "config.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "mpvcore/m_config.h"
 #include "audio/format.h"
 #include "mpvcore/mp_msg.h"

demux/demux.c

@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 
 #include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/av_common.h"
 #include "talloc.h"
 #include "mpvcore/mp_msg.h"

demux/demux_lavf.c

@@ -35,7 +35,7 @@
 #include "compat/libav.h"
 
 #include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/av_opts.h"
 #include "mpvcore/av_common.h"
@@ -44,7 +44,7 @@
 #include "stream/stream.h"
 #include "demux.h"
 #include "stheader.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 #define INITIAL_PROBE_SIZE STREAM_BUFFER_SIZE
 #define PROBE_BUF_SIZE FFMIN(STREAM_MAX_BUFFER_SIZE, 2 * 1024 * 1024)

demux/demux_libass.c

@@ -21,7 +21,7 @@
 #include <ass/ass.h>
 #include <ass/ass_types.h>
 
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/charset_conv.h"
 #include "stream/stream.h"

demux/demux_mkv.c

@@ -42,7 +42,7 @@
 #endif
 
 #include "talloc.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/bstr.h"
 #include "stream/stream.h"
 #include "demux.h"

demux/demux_playlist.c

@@ -16,10 +16,10 @@
  */
 
 #include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/playlist.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "stream/stream.h"
 #include "demux.h"
 

demux/demux_raw.c

@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 #include "stream/stream.h"
 #include "demux.h"

demux/demux_subreader.c

@@ -34,7 +34,7 @@
 #include "config.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "stream/stream.h"
 #include "demux/demux.h"
 

demux/mf.c

@@ -39,7 +39,7 @@
 #include "talloc.h"
 #include "mpvcore/mp_msg.h"
 #include "stream/stream.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "mpvcore/mp_talloc.h"
 
 #include "mf.h"

input/input.c

@@ -43,11 +43,10 @@
 #include "osdep/timer.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/mpv_global.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/path.h"
+#include "options/m_option.h"
+#include "options/path.h"
 #include "talloc.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/bstr.h"
 #include "stream/stream.h"
 #include "mpvcore/mp_common.h"

input/input.h

@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 #include "mpvcore/bstr.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 // All command IDs
 enum mp_command_type {

mpvcore/encode_lavc.c

@@ -25,7 +25,7 @@
 #include "encode_lavc.h"
 #include "mpvcore/mp_msg.h"
 #include "video/vfcap.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "osdep/timer.h"
 #include "video/out/vo.h"
 #include "talloc.h"

mpvcore/playlist.c

@@ -20,7 +20,7 @@
 #include "playlist.h"
 #include "mpvcore/mp_common.h"
 #include "talloc.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 
 struct playlist_entry *playlist_entry_new(const char *filename)
 {

mpvcore/playlist_parser.c

@@ -36,13 +36,12 @@
 
 #include "talloc.h"
 #include "asxparser.h"
-#include "m_config.h"
 #include "playlist.h"
 #include "playlist_parser.h"
 #include "stream/stream.h"
 #include "demux/demux.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 
 
 #define BUF_STEP 1024

old-makefile

@@ -201,19 +201,19 @@ SOURCES = audio/audio.c \
           mpvcore/charset_conv.c \
           mpvcore/codecs.c \
           mpvcore/cpudetect.c \
-          mpvcore/m_config.c \
-          mpvcore/m_option.c \
-          mpvcore/m_property.c \
           mpvcore/mp_common.c \
           mpvcore/mp_msg.c \
           mpvcore/mp_ring.c \
-          mpvcore/options.c \
-          mpvcore/parser-cfg.c \
-          mpvcore/parser-mpcmd.c \
-          mpvcore/path.c \
           mpvcore/playlist.c \
           mpvcore/playlist_parser.c \
           mpvcore/version.c \
+          options/m_config.c \
+          options/m_option.c \
+          options/m_property.c \
+          options/options.c \
+          options/parse_commandline.c \
+          options/parse_configfile.c \
+          options/path.c \
           osdep/io.c \
           osdep/numcores.c \
           osdep/timer.c \

options/m_config.c

@@ -31,7 +31,7 @@
 #include "talloc.h"
 
 #include "m_config.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "mpvcore/mp_msg.h"
 
 static const union m_option_value default_value;

options/m_option.c

@@ -37,9 +37,9 @@
 
 #include "talloc.h"
 #include "mpvcore/mp_common.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_config.h"
 #include "mpvcore/mp_msg.h"
+#include "m_option.h"
+#include "m_config.h"
 
 char *m_option_strerror(int code)
 {

options/m_property.c

@@ -30,7 +30,7 @@
 #include <libavutil/common.h>
 
 #include "talloc.h"
-#include "mpvcore/m_option.h"
+#include "m_option.h"
 #include "m_property.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/mp_common.h"

options/options.c

@@ -27,11 +27,11 @@
 #include <sys/types.h>
 #include <limits.h>
 
-#include "mpvcore/options.h"
+#include "options.h"
 #include "config.h"
 #include "version.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/m_option.h"
+#include "m_config.h"
+#include "m_option.h"
 #include "stream/tv.h"
 #include "stream/stream_radio.h"
 #include "video/csputils.h"

options/options.h

@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "mpvcore/m_option.h"
+#include "m_option.h"
 
 typedef struct mp_vo_opts {
     struct m_obj_settings *video_driver_list, *vo_defs;

options/parse_commandline.c

@@ -26,11 +26,11 @@
 #include <stdbool.h>
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "m_option.h"
 #include "m_config.h"
-#include "playlist.h"
-#include "playlist_parser.h"
-#include "parser-mpcmd.h"
+#include "mpvcore/playlist.h"
+#include "mpvcore/playlist_parser.h"
+#include "parse_commandline.h"
 
 #define GLOBAL 0
 #define LOCAL 1

options/parse_configfile.c

@@ -27,9 +27,9 @@
 
 #include "osdep/io.h"
 
-#include "parser-cfg.h"
+#include "parse_configfile.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "m_option.h"
 #include "m_config.h"
 
 /// Maximal include depth.

options/path.c

@@ -34,7 +34,7 @@
 #include <errno.h>
 #include "config.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "talloc.h"
 #include "osdep/io.h"
 #include "osdep/path.h"

osdep/path-win.c

@@ -20,7 +20,7 @@
 
 #include "osdep/path.h"
 #include "osdep/io.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 
 // Warning: do not use PATH_MAX. Cygwin messed it up.
 

player/audio.c

@@ -26,7 +26,7 @@
 #include "talloc.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_common.h"
 
 #include "audio/mixer.h"

player/command.c

@@ -42,9 +42,9 @@
 #include "mpvcore/playlist_parser.h"
 #include "sub/osd.h"
 #include "sub/dec_sub.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_property.h"
-#include "mpvcore/m_config.h"
+#include "options/m_option.h"
+#include "options/m_property.h"
+#include "options/m_config.h"
 #include "video/filter/vf.h"
 #include "video/decode/vd.h"
 #include "video/out/vo.h"
@@ -55,7 +55,7 @@
 #include "audio/filter/af.h"
 #include "video/decode/dec_video.h"
 #include "audio/decode/dec_audio.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "stream/tv.h"
 #include "stream/stream_radio.h"
 #include "stream/pvr.h"

player/configfiles.c

@@ -32,12 +32,12 @@
 #include "osdep/io.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/parser-cfg.h"
+#include "options/path.h"
+#include "options/m_config.h"
+#include "options/parse_configfile.h"
 #include "mpvcore/playlist.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_property.h"
+#include "options/options.h"
+#include "options/m_property.h"
 
 #include "stream/stream.h"
 

player/core.h

@@ -22,7 +22,7 @@
 #include <stdbool.h>
 
 #include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 
 // definitions used internally by the core player code
 

player/loadfile.c

@@ -31,12 +31,12 @@
 #include "osdep/timer.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/parser-cfg.h"
+#include "options/path.h"
+#include "options/m_config.h"
+#include "options/parse_configfile.h"
 #include "mpvcore/playlist.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_property.h"
+#include "options/options.h"
+#include "options/m_property.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/encode.h"
 #include "input/input.h"

player/lua.c

@@ -8,11 +8,11 @@
 #include "talloc.h"
 
 #include "mpvcore/mp_common.h"
-#include "mpvcore/m_property.h"
+#include "options/m_property.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "input/input.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "mpvcore/bstr.h"
 #include "osdep/timer.h"
 #include "sub/osd.h"

player/main.c

@@ -36,17 +36,17 @@
 #include "mpvcore/codecs.h"
 #include "mpvcore/cpudetect.h"
 #include "mpvcore/encode.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_property.h"
+#include "options/m_config.h"
+#include "options/m_option.h"
+#include "options/m_property.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/mpv_global.h"
-#include "mpvcore/parser-cfg.h"
-#include "mpvcore/parser-mpcmd.h"
+#include "options/parse_configfile.h"
+#include "options/parse_commandline.h"
 #include "mpvcore/playlist.h"
 #include "mpvcore/playlist_parser.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "input/input.h"
 
 #include "audio/decode/dec_audio.h"

player/misc.c

@@ -27,8 +27,8 @@
 #include "osdep/timer.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_property.h"
+#include "options/options.h"
+#include "options/m_property.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/encode.h"
 #include "mpvcore/playlist.h"

player/osd.c

@@ -27,9 +27,9 @@
 #include "talloc.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_common.h"
-#include "mpvcore/m_property.h"
+#include "options/m_property.h"
 #include "mpvcore/encode.h"
 
 #include "osdep/getch2.h"

player/playloop.c

@@ -26,10 +26,10 @@
 #include "talloc.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/encode.h"
-#include "mpvcore/m_property.h"
+#include "options/m_property.h"
 #include "mpvcore/playlist.h"
 #include "input/input.h"
 

player/screenshot.c

@@ -30,7 +30,7 @@
 #include "command.h"
 #include "mpvcore/bstr.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "video/mp_image.h"
 #include "video/decode/dec_video.h"
 #include "video/filter/vf.h"

player/sub.c

@@ -26,7 +26,7 @@
 #include "talloc.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_common.h"
 
 #include "stream/stream.h"

player/timeline/tl_cue.c

@@ -27,7 +27,7 @@
 #include "player/core.h"
 #include "mpvcore/mp_msg.h"
 #include "demux/demux.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "mpvcore/bstr.h"
 #include "mpvcore/mp_common.h"
 #include "stream/stream.h"

player/timeline/tl_matroska.c

@@ -33,7 +33,7 @@
 #include "player/core.h"
 #include "mpvcore/mp_msg.h"
 #include "demux/demux.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "mpvcore/bstr.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/playlist.h"

player/timeline/tl_mpv_edl.c

@@ -27,7 +27,7 @@
 #include "player/core.h"
 #include "mpvcore/mp_msg.h"
 #include "demux/demux.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "mpvcore/bstr.h"
 #include "mpvcore/mp_common.h"
 #include "stream/stream.h"

player/video.c

@@ -26,10 +26,10 @@
 #include "talloc.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/encode.h"
-#include "mpvcore/m_property.h"
+#include "options/m_property.h"
 
 #include "audio/out/ao.h"
 #include "demux/demux.h"

stream/cookies.c

@@ -33,7 +33,7 @@
 
 #include "osdep/io.h"
 
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "cookies.h"
 #include "mpvcore/mp_msg.h"
 

stream/resolve/resolve_quvi.c

@@ -20,7 +20,7 @@
 
 #include "talloc.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "resolve.h"
 
 static void add_source(struct mp_resolve_result *res, const char *url,

stream/resolve/resolve_quvi9.c

@@ -23,7 +23,7 @@
 
 #include "talloc.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/playlist.h"
 #include "resolve.h"
 

stream/stream.c

@@ -40,12 +40,12 @@
 #include "mpvcore/mp_common.h"
 #include "mpvcore/bstr.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "osdep/timer.h"
 #include "stream.h"
 
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_config.h"
+#include "options/m_option.h"
+#include "options/m_config.h"
 
 // Includes additional padding in case sizes get rounded up by sector size.
 #define TOTAL_BUFFER_SIZE (STREAM_MAX_BUFFER_SIZE + STREAM_MAX_SECTOR_SIZE)

stream/stream_bluray.c

@@ -38,7 +38,7 @@
 #include "config.h"
 #include "talloc.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "stream.h"
 
 #define BLURAY_SECTOR_SIZE     6144

stream/stream_cdda.c

@@ -42,7 +42,7 @@
 #include "talloc.h"
 
 #include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "libavutil/common.h"
 #include "compat/mpbswap.h"
 

stream/stream_dvb.c

@@ -47,8 +47,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #include "osdep/io.h"
 
 #include "stream.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/path.h"
+#include "options/m_option.h"
+#include "options/path.h"
 
 #include "dvbin.h"
 

stream/stream_dvd.c

@@ -38,7 +38,7 @@
 #define FIRST_PCM_AID 160
 
 #include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 #include "stream_dvd.h"
 #include "stream_dvd_common.h"

stream/stream_dvd.h

@@ -26,7 +26,7 @@
 #include <dvdread/ifo_read.h>
 #include <dvdread/nav_read.h>
 #include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 typedef struct {
   dvd_reader_t *dvd;

stream/stream_dvdnav.c

@@ -28,10 +28,10 @@
 
 #include <dvdnav/dvdnav.h>
 
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_msg.h"
 #include "input/input.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "osdep/timer.h"
 #include "stream.h"
 #include "demux/demux.h"

stream/stream_file.c

@@ -31,7 +31,7 @@
 
 #include "mpvcore/mp_msg.h"
 #include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 struct priv {
     int fd;

stream/stream_lavf.c

@@ -21,10 +21,10 @@
 #include <libavutil/opt.h>
 
 #include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_msg.h"
 #include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 #include "cookies.h"
 

stream/stream_radio.c

@@ -42,7 +42,7 @@
 #include <libavutil/avstring.h>
 
 #include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "mpvcore/mp_msg.h"
 #include "stream_radio.h"
 

stream/stream_rar.c

@@ -35,7 +35,7 @@
 
 #include "mpvcore/mp_msg.h"
 #include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "rar.h"
 
 /*

stream/stream_smb.c

@@ -25,7 +25,7 @@
 
 #include "mpvcore/mp_msg.h"
 #include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 struct priv {
     int fd;

stream/stream_tv.c

@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "tv.h"
 
 #include <stdio.h>

stream/stream_vcd.c

@@ -26,7 +26,7 @@
 
 #include "mpvcore/mp_msg.h"
 #include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 #include <fcntl.h>
 #include <stdlib.h>

sub/ass_mp.c

@@ -31,11 +31,11 @@
 
 #include "config.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "ass_mp.h"
 #include "osd.h"
 #include "stream/stream.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 
 // res_y should be track->PlayResY
 // It determines scaling of font sizes and more.

sub/dec_sub.c

@@ -26,7 +26,7 @@
 #include "demux/demux.h"
 #include "sd.h"
 #include "dec_sub.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/charset_conv.h"
 

sub/find_subfiles.c

@@ -7,8 +7,8 @@
 #include "osdep/io.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
-#include "mpvcore/path.h"
+#include "options/options.h"
+#include "options/path.h"
 #include "mpvcore/mp_common.h"
 #include "sub/find_subfiles.h"
 

sub/osd.c

@@ -30,7 +30,7 @@
 #include "osdep/timer.h"
 
 #include "talloc.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_msg.h"
 #include "osd.h"
 #include "dec_sub.h"

sub/osd.h

@@ -23,7 +23,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 // NOTE: VOs must support at least SUBBITMAP_RGBA.
 enum sub_bitmap_format {

sub/osd_libass.c

@@ -34,7 +34,7 @@ static const char osd_font_pfb[] =
 ;
 
 #include "sub/ass_mp.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 
 
 #define ASS_USE_OSD_FONT "{\\fnmpv-osd-symbols}"

sub/sd_ass.c

@@ -25,7 +25,7 @@
 
 #include "talloc.h"
 
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/mp_msg.h"
 #include "video/csputils.h"

sub/sd_lavc.c

@@ -24,7 +24,7 @@
 #include "talloc.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/av_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "video/mp_image.h"
 #include "sd.h"
 #include "dec_sub.h"

sub/sd_spu.c

@@ -19,7 +19,7 @@
 #include <assert.h>
 
 #include "talloc.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "video/mp_image.h"
 #include "sd.h"
 #include "spudec.h"

video/decode/dec_video.c

@@ -17,7 +17,7 @@
  */
 
 #include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 
 #include <stdio.h>
 #include <stdlib.h>

video/decode/vd_lavc.c

@@ -33,7 +33,7 @@
 #include "talloc.h"
 #include "config.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/bstr.h"
 #include "mpvcore/av_opts.h"
 #include "mpvcore/av_common.h"
@@ -57,7 +57,7 @@
 #error palette too large, adapt video/mp_image.h:MP_PALETTE_SIZE
 #endif
 
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 static void init_avctx(struct dec_video *vd, const char *decoder,
                        struct vd_lavc_hwdec *hwdec);

video/filter/vf.c

@@ -27,10 +27,10 @@
 #include "config.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_config.h"
+#include "options/m_option.h"
+#include "options/m_config.h"
 
-#include "mpvcore/options.h"
+#include "options/options.h"
 
 #include "video/img_format.h"
 #include "video/mp_image.h"

video/filter/vf_crop.c

@@ -22,13 +22,13 @@
 
 #include "config.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 
 #include "video/img_format.h"
 #include "video/mp_image.h"
 #include "vf.h"
 
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 static const struct vf_priv_s {
     int crop_w,crop_h;