diff options
| author | adrian <adrian@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-15 20:25:50 +0000 |
|---|---|---|
| committer | adrian <adrian@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-15 20:25:50 +0000 |
| commit | 5f0b5dcaa96326512835afbae46c30aeaa164b13 (patch) | |
| tree | 8263d47463cc170bb54228b75598961c8b96f960 | |
| parent | 8448c911533acaf60aeb3d2780c32c015d13f0c4 (diff) | |
| download | mpv-5f0b5dcaa96326512835afbae46c30aeaa164b13.tar.bz2 mpv-5f0b5dcaa96326512835afbae46c30aeaa164b13.tar.xz | |
Add -xineramascreen support to corevideo vo. Still prefer corevideo's own device_id parameter if it's set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30042 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 4 | ||||
| -rw-r--r-- | libvo/vo_corevideo.m | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index a7d1d1de8b..f4e1863879 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3142,7 +3142,7 @@ vdpau, x11, xv, xvmc). .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 @@ This option is not suitable to only set the startup screen (because 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 --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m index e4b5e85545..f2b29edfd2 100644 --- a/libvo/vo_corevideo.m +++ b/libvo/vo_corevideo.m @@ -115,6 +115,9 @@ static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigne 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]) { |