Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	bstr.c
	cfg-mplayer.h
	defaultopts.c
	libvo/video_out.c

The conflict in bstr.c is due to uau adding a bstr_getline function in
commit 2ba8b91a97e7e8. This function already existed in this branch.
While uau's function is obviously derived from mine, it's incompatible.
His function preserves line breaks, while mine strips them. Add a
bstr_strip_linebreaks function, fix all other uses of bstr_getline, and
pick uau's implementation.

In .gitignore, change vo_gl3_shaders.h to use an absolute path
additional to resolving the merge conflict.

1 files changed, 8 insertions, 0 deletions

diff --git a/m_config.h b/m_config.h
index ff54aae8b2..24e80eb538 100644
--- a/m_config.h
+++ b/m_config.h
@@ -96,6 +96,7 @@ typedef struct m_config {
 
     void *optstruct; // struct mpopts or other
     int (*includefunc)(struct m_config *conf, char *filename);
+    bool full;  // main config with save slot handling etc
 } m_config_t;
 
 
@@ -110,6 +111,10 @@ struct m_config *
 m_config_new(void *optstruct,
              int includefunc(struct m_config *conf, char *filename));
 
+struct m_config *m_config_simple(const struct m_option *options);
+
+void m_config_initialize(struct m_config *conf, void *optstruct);
+
 // Free a config object.
 void m_config_free(struct m_config *config);
 
@@ -162,6 +167,9 @@ static inline int m_config_check_option0(struct m_config *config,
     return m_config_check_option(config, bstr(name), bstr(param), ambiguous);
 }
 
+int m_config_parse_suboptions(struct m_config *config, void *optstruct,
+                              char *name, char *subopts);
+
 
 /*  Get the option matching the given name.
  *  \param config The config object.