diff options
Diffstat (limited to 'DOCS/man/en/mplayer.rst')
-rw-r--r-- | DOCS/man/en/mplayer.rst | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/DOCS/man/en/mplayer.rst b/DOCS/man/en/mplayer.rst index 89c125a1e0..b287669d63 100644 --- a/DOCS/man/en/mplayer.rst +++ b/DOCS/man/en/mplayer.rst @@ -326,7 +326,7 @@ escape these on some shells.) Example: +-----------+-------------------------+ Additionally, any file-local option changed at runtime is reset when the current -file stops playing. If option ``-c`` is changed during playback of `file2.mkv`, +file stops playing. If option ``--c`` is changed during playback of `file2.mkv`, it's reset when advancing to `file3.mkv`. This only affects file-local options. The option ``--a`` is never reset here. @@ -358,8 +358,8 @@ as the file played and then tries to load any file-specific configuration. *EXAMPLE MPLAYER CONFIGURATION FILE:* -| # Use Matrox driver by default. -| vo=xmga +| # Use gl3 video output by default. +| vo=gl3 | # I love practicing handstands while watching videos. | flip=yes | # Decode multiple files from PNG, @@ -390,9 +390,6 @@ option. To end the profile, start another one or use the profile name | profile-desc="profile for .flv files" | flip=yes | -| [vo.pnm] -| outdir=/tmp -| | [ao.alsa] | device=spdif @@ -429,9 +426,9 @@ screenshots with the video filter is not instant: the screenshot will be only saved when the next video frame is displayed. This means attempting to take a screenshot while the player is paused will do nothing, until the user unpauses or seeks. Also, the screenshot filter is not compatible with hardware decoding, -and actually will cause initialization failure when use with hardware decodingis -attempted. Using the ``screenshot`` video filter is not recommended for these -reasons. +and actually will cause initialization failure when use with hardware decoding +is attempted. Using the ``screenshot`` video filter is not recommended for +these reasons. .. include:: changes.rst @@ -494,7 +491,7 @@ libdvdcss: rely on a key exchange with the DVD drive, but rather uses a crypto attack to guess the title key. On rare cases this may fail because there is not enough encrypted data on the disc to perform a - statistical attack, but in the other hand it is the only way to + statistical attack, but on the other hand it is the only way to decrypt a DVD stored on a hard disc, or a DVD with the wrong region on an RPC2 drive. @@ -519,12 +516,6 @@ libdvdcss: FIXME: Document this. libao2: - ``AO_SUN_DISABLE_SAMPLE_TIMING`` - FIXME: Document this. - - ``AUDIODEV`` - FIXME: Document this. - ``AUDIOSERVER`` Specifies the Network Audio System server to which the nas audio output driver should connect and the transport that should be used. If @@ -647,21 +638,12 @@ Play from a different DVD device: Play DVD video from a directory with VOB files: ``mplayer dvd://1 --dvd-device=/path/to/directory/`` -Copy a DVD title to hard disk, saving to file title1.vob : - ``mplayer dvd://1 --dumpstream --dumpfile=title1.vob`` - Stream from HTTP: ``mplayer http://mplayer.hq/example.avi`` Stream using RTSP: ``mplayer rtsp://server.example.com/streamName`` -Convert subtitles to MPsub format: - ``mplayer dummy.avi --sub=source.sub --dumpmpsub`` - -Convert subtitles to MPsub format without watching the movie: - ``mplayer /dev/zero --rawvideo=pal:fps=xx --demuxer=rawvideo --vc=null --vo=null --noframedrop --benchmark --sub=source.sub --dumpmpsub`` - input from standard V4L: ``mplayer tv:// --tv=driver=v4l:width=640:height=480:outfmt=i420 --vc=rawi420 --vo=xv`` |