diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-22 00:46:02 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-22 00:46:02 +0200 |
| commit | fccb0a7e45b61128262a396f2426bd7168fd198c (patch) | |
| tree | ac09e6b90d4389717f32181f8b6f3848ffb149fe /DOCS/man | |
| parent | 71b25cca7644ab059393e9ee4682d79aab41ceba (diff) | |
| parent | ce821bd91f0b0c67b96f5d3b8f3fda19e1015294 (diff) | |
| download | mpv-fccb0a7e45b61128262a396f2426bd7168fd198c.tar.bz2 mpv-fccb0a7e45b61128262a396f2426bd7168fd198c.tar.xz | |
Merge svn changes up to r28176
Conflicts:
libvo/video_out.c
libvo/x11_common.c
Diffstat (limited to 'DOCS/man')
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index ab946c2fd4..bac5306e5e 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3544,6 +3544,9 @@ Mac OS X CoreVideo video output driver .RSs .IPs device_id=<number> Choose the display device to use in fullscreen. +.IPs shared_buffer +Write output to a shared memory buffer instead of displaying it and +try to open an existing NSConnection for communication with a GUI. .RE .PD 1 . |