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

diff --git a/libvo/vo_sharedbuffer.h b/libvo/vo_sharedbuffer.h
new file mode 100644
index 0000000000..c25463aa0a
--- /dev/null
+++ b/libvo/vo_sharedbuffer.h
@@ -0,0 +1,37 @@
+/*
+ * OSX Shared Buffer Video Output (extracted from mplayer's corevideo)
+ *
+ * This file is part of mplayer2.
+ *
+ * mplayer2 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * mplayer2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with mplayer2.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MPLAYER_VO_OSX_SHAREDBUFFER_H
+#define MPLAYER_VO_OSX_SHAREDBUFFER_H
+
+#import <Cocoa/Cocoa.h>
+
+// Protocol to communicate with the GUI
+@protocol MPlayerOSXVOProto
+- (int) startWithWidth: (bycopy int)width
+            withHeight: (bycopy int)height
+             withBytes: (bycopy int)bytes
+            withAspect: (bycopy int)aspect;
+- (void) stop;
+- (void) render;
+- (void) toggleFullscreen;
+- (void) ontop;
+@end
+
+#endif /* MPLAYER_VO_OSX_SHAREDBUFFER_H */