diff options
Diffstat (limited to 'options')
-rw-r--r-- | options/m_config.c | 2 | ||||
-rw-r--r-- | options/m_config.h | 2 | ||||
-rw-r--r-- | options/m_option.c | 4 | ||||
-rw-r--r-- | options/m_option.h | 2 | ||||
-rw-r--r-- | options/m_property.c | 4 | ||||
-rw-r--r-- | options/parse_commandline.c | 6 | ||||
-rw-r--r-- | options/parse_configfile.c | 2 | ||||
-rw-r--r-- | options/path.c | 2 | ||||
-rw-r--r-- | options/path.h | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/options/m_config.c b/options/m_config.c index 5040482c84..d9a3343ab7 100644 --- a/options/m_config.c +++ b/options/m_config.c @@ -32,7 +32,7 @@ #include "m_config.h" #include "options/m_option.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" static const union m_option_value default_value; diff --git a/options/m_config.h b/options/m_config.h index 8a8865d68e..1f03a9abea 100644 --- a/options/m_config.h +++ b/options/m_config.h @@ -22,7 +22,7 @@ #include <stddef.h> #include <stdbool.h> -#include "mpvcore/bstr.h" +#include "bstr/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/options/m_option.c b/options/m_option.c index b4bd50a23f..d93c18ee52 100644 --- a/options/m_option.c +++ b/options/m_option.c @@ -36,8 +36,8 @@ #include <libavutil/avstring.h> #include "talloc.h" -#include "mpvcore/mp_common.h" -#include "mpvcore/mp_msg.h" +#include "common/common.h" +#include "common/msg.h" #include "m_option.h" #include "m_config.h" diff --git a/options/m_option.h b/options/m_option.h index dfc9e28a9b..041915bbc1 100644 --- a/options/m_option.h +++ b/options/m_option.h @@ -24,7 +24,7 @@ #include <stdbool.h> #include "config.h" -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" #include "audio/chmap.h" // m_option allows to parse, print and copy data of various types. diff --git a/options/m_property.c b/options/m_property.c index 38f6a742c9..d01a2cabd7 100644 --- a/options/m_property.c +++ b/options/m_property.c @@ -32,8 +32,8 @@ #include "talloc.h" #include "m_option.h" #include "m_property.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/mp_common.h" +#include "common/msg.h" +#include "common/common.h" const struct m_option_type m_option_type_dummy = { .name = "Unknown", diff --git a/options/parse_commandline.c b/options/parse_commandline.c index a6feee82c3..182844ccc9 100644 --- a/options/parse_commandline.c +++ b/options/parse_commandline.c @@ -25,11 +25,11 @@ #include <assert.h> #include <stdbool.h> -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "m_option.h" #include "m_config.h" -#include "mpvcore/playlist.h" -#include "mpvcore/playlist_parser.h" +#include "common/playlist.h" +#include "common/playlist_parser.h" #include "parse_commandline.h" #define GLOBAL 0 diff --git a/options/parse_configfile.c b/options/parse_configfile.c index f82e740df9..af88d1aa62 100644 --- a/options/parse_configfile.c +++ b/options/parse_configfile.c @@ -28,7 +28,7 @@ #include "osdep/io.h" #include "parse_configfile.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "m_option.h" #include "m_config.h" diff --git a/options/path.c b/options/path.c index a2b2f135c5..43c2c0fb80 100644 --- a/options/path.c +++ b/options/path.c @@ -33,7 +33,7 @@ #include <unistd.h> #include <errno.h> #include "config.h" -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "options/path.h" #include "talloc.h" #include "osdep/io.h" diff --git a/options/path.h b/options/path.h index e0c61321d2..e3de212ef3 100644 --- a/options/path.h +++ b/options/path.h @@ -22,7 +22,7 @@ #define MPLAYER_PATH_H #include <stdbool.h> -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" // Search for the input filename in several paths. These include user and global |