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, 6 insertions, 0 deletions

diff --git a/libvo/video_out.h b/libvo/video_out.h
index 1fe726def5..df27d373fe 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -239,6 +239,12 @@ struct vo_driver {
      * Closes driver. Should restore the original state of the system.
      */
     void (*uninit)(struct vo *vo);
+
+    // Size of private struct for automatic allocation
+    int privsize;
+
+    // List of options to parse into priv struct (requires privsize to be set)
+    const struct m_option *options;
 };
 
 struct vo_old_functions {