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, 3 insertions, 2 deletions

diff --git a/codec-cfg.h b/codec-cfg.h
index 19fd47d94c..480f570bba 100644
--- a/codec-cfg.h
+++ b/codec-cfg.h
@@ -19,6 +19,8 @@
 #ifndef MPLAYER_CODEC_CFG_H
 #define MPLAYER_CODEC_CFG_H
 
+#include <stdbool.h>
+
 #define CODECS_MAX_FOURCC       92
 #define CODECS_MAX_OUTFMT       16
 #define CODECS_MAX_INFMT        16
@@ -67,10 +69,9 @@ typedef struct codecs {
     char *dll;
     char* drv;
     GUID guid;
-//    short driver;
     short flags;
     short status;
-    short cpuflags;
+    bool anyinput;
 } codecs_t;
 
 int parse_codec_cfg(const char *cfgfile);