diff options
author | wm4 <wm4@nowhere> | 2013-12-17 02:02:25 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-17 02:07:57 +0100 |
commit | eb15151705d47d23da844449126cc6b4879f110e (patch) | |
tree | 661866ee9e73bc893c7963660aae01db503e99aa /sub | |
parent | 793f85945fc07db905e54390c065ae51b9eeef9b (diff) | |
download | mpv-eb15151705d47d23da844449126cc6b4879f110e.tar.bz2 mpv-eb15151705d47d23da844449126cc6b4879f110e.tar.xz |
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.
Diffstat (limited to 'sub')
-rw-r--r-- | sub/ass_mp.c | 4 | ||||
-rw-r--r-- | sub/dec_sub.c | 2 | ||||
-rw-r--r-- | sub/find_subfiles.c | 4 | ||||
-rw-r--r-- | sub/osd.c | 2 | ||||
-rw-r--r-- | sub/osd.h | 2 | ||||
-rw-r--r-- | sub/osd_libass.c | 2 | ||||
-rw-r--r-- | sub/sd_ass.c | 2 | ||||
-rw-r--r-- | sub/sd_lavc.c | 2 | ||||
-rw-r--r-- | sub/sd_spu.c | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/sub/ass_mp.c b/sub/ass_mp.c index 44b59e34d5..75178d804d 100644 --- a/sub/ass_mp.c +++ b/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. diff --git a/sub/dec_sub.c b/sub/dec_sub.c index 425db1b3e8..c5d45f81df 100644 --- a/sub/dec_sub.c +++ b/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" diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c index 479e8a0785..ce23bd50c4 100644 --- a/sub/find_subfiles.c +++ b/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" @@ -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" @@ -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 { diff --git a/sub/osd_libass.c b/sub/osd_libass.c index 44154b8997..16e90eea1e 100644 --- a/sub/osd_libass.c +++ b/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}" diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 631c81a083..a8d5be633d 100644 --- a/sub/sd_ass.c +++ b/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" diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index da8a07e48e..0e7121a279 100644 --- a/sub/sd_lavc.c +++ b/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" diff --git a/sub/sd_spu.c b/sub/sd_spu.c index 15ea351159..1f815c93aa 100644 --- a/sub/sd_spu.c +++ b/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" |