Merge remote-tracking branch 'origin/master'

Conflicts:
	bstr.c
	bstr.h
	libvo/cocoa_common.m
	libvo/gl_common.c
	libvo/video_out.c
	mplayer.c
	screenshot.c
	sub/subassconvert.c

Merge of cocoa_common.m done by pigoz.

Picking my version of screenshot.c. The fix in commit aadf1002f8a will
be redone in a follow-up commit, as the original commit causes too many
conflicts with the work done locally in this branch, and other work in
progress.

1 files changed, 0 insertions, 1 deletions

diff --git a/bstr.h b/bstr.h
index e8a34b4f2c..688ed41771 100644
--- a/bstr.h
+++ b/bstr.h
@@ -96,7 +96,6 @@ bool bstr_case_endswith(struct bstr s, struct bstr suffix);
 struct bstr bstr_strip_ext(struct bstr str);
 struct bstr bstr_get_ext(struct bstr s);
 
-
 static inline struct bstr bstr_cut(struct bstr str, int n)
 {
     if (n < 0) {