diff options
| author | wm4 <wm4@nowhere> | 2012-11-09 01:06:43 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-12 20:08:18 +0100 |
| commit | 4873b32c5959c988af1769529ff72e3fd62fba82 (patch) | |
| tree | e18fbd7eef54de6071969689aa5c31d6ea1f0963 /core/m_option.c | |
| parent | d4bdd0473d6f43132257c9fb3848d829755167a3 (diff) | |
| download | mpv-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.)
Diffstat (limited to 'core/m_option.c')
| -rw-r--r-- | core/m_option.c | 10 |
1 files changed, 5 insertions, 5 deletions
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)) |