# HG changeset patch
# User adrian
# Date 1260908750 0
# Node ID a30debd7acd7bee7f89d40830c2c8e55835c68fd
# Parent  21ea15331e759ec5b6a9bc1aa7f3fb6e495ff224
Add -xineramascreen support to corevideo vo. Still prefer corevideo's own device_id parameter if it's set.

diff -r 21ea15331e75 -r a30debd7acd7 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Tue Dec 15 02:13:51 2009 +0000
+++ b/DOCS/man/en/mplayer.1	Tue Dec 15 20:25:50 2009 +0000
@@ -3142,7 +3142,7 @@
 .br
 .I NOTE:
 This option is only supported by the x11, xmga, xv, xvmc, xvidix,
-gl, gl2, directx, fbdev and tdfxfb video output drivers.
+gl, gl2, directx, fbdev, tdfxfb and corevideo video output drivers.
 .sp 1
 .I EXAMPLE:
 .PD 0
@@ -3330,7 +3330,7 @@
 it will always display on the given screen in fullscreen mode),
 \-geometry is the best that is available for that purpose
 currently.
-Supported by at least the direct3d, gl, gl2, x11 and xv video output drivers.
+Supported by at least the direct3d, gl, gl2, x11, xv and corevideo video output drivers.
 .
 .TP
 .B \-zrbw (\-vo zr only)
diff -r 21ea15331e75 -r a30debd7acd7 libvo/vo_corevideo.m
--- a/libvo/vo_corevideo.m	Tue Dec 15 02:13:51 2009 +0000
+++ b/libvo/vo_corevideo.m	Tue Dec 15 20:25:50 2009 +0000
@@ -115,6 +115,9 @@
 
 static void update_screen_info(void)
 {
+	if (screen_id == -1 && xinerama_screen > -1)
+		screen_id = xinerama_screen;
+
 	screen_array = [NSScreen screens];
 	if(screen_id < (int)[screen_array count])
 	{