diff options
114 files changed, 4355 insertions, 3263 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 53a27b51e4..efd71a63c3 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -780,10 +780,6 @@ Time in milliseconds to recognize two consecutive button presses as a double-click (default: 300). Set to 0 to let your windowing system decide what a double-click is (\-vo directx only). -.br -.I NOTE: -You will get slightly different behaviour depending on whether you bind -MOUSE_BTN0_DBL or MOUSE_BTN0\-MOUSE_BTN0_DBL. . .TP .B \-edlout <filename> @@ -926,13 +922,10 @@ several 'echo "seek 10" > mp_pipe' and the pipe will stay valid. .TP .B \-key\-fifo\-size <2\-65000> Specify the size of the FIFO that buffers key events (default: 7). -A FIFO of size n can buffer (n\-1) events. -If it is too small some events may be lost -(leading to "stuck mouse buttons" and similar effects). -If it is too big, MPlayer may seem to hang while it -processes the buffered events. -To get the same behavior as before this option was introduced, -set it to 2 for Linux or 1024 for Windows. +If it is too small some events may be lost. +The main disadvantage of setting it to a very large value is that if you +hold down a key triggering some particularly slow command then the player +may be unresponsive while it processes all the queued commands. . .TP .B \-lircconf <filename> (LIRC only) @@ -1177,9 +1170,7 @@ Plays a Matroska file in Japanese. Force audio demuxer type for \-audiofile. Use a '+' before the name to force it, this will skip some checks! Give the demuxer name as printed by \-audio\-demuxer help. -For backward compatibility it also accepts the demuxer ID as defined in -libmpdemux/\:demuxer.h. -\-audio\-demuxer audio or \-audio\-demuxer 17 forces MP3. +\-audio\-demuxer audio forces MP3. . .TP .B \-audiofile <filename> @@ -1356,8 +1347,6 @@ This nullifies stream delays. Force demuxer type. Use a '+' before the name to force it, this will skip some checks! Give the demuxer name as printed by \-demuxer help. -For backward compatibility it also accepts the demuxer ID as defined in -libmpdemux/\:demuxer.h. . .TP .B \-dumpaudio @@ -1532,6 +1521,43 @@ Skip the proxy for IPv6 addresses. It will still be used for IPv4 connections. . .TP +.B \-lavfdopts <option1:option2:...> +Specify parameters for libavformat demuxers (\-demuxer lavf). +Separate multiple options with a colon. +.sp +.RS +Available suboptions are: +.RE +.RSs +.IPs analyzeduration=<value> +Maximum length in seconds to analyze the stream properties. +.IPs format=<value> +Force a specific libavformat demuxer. +.IPs o=<key>=<value>[,<key>=<value>[,...]] +Pass AVOptions to libavformat demuxer. +Note, a patch to make the o= unneeded and pass all unknown options through +the AVOption system is welcome. +A full list of AVOptions can be found in the FFmpeg manual. +Note that some options may conflict with MPlayer options. +.sp 1 +.RS +.I EXAMPLE: +.RE +.RSs +.PD 0 +.IPs o=fflags=+ignidx +.PD 1 +.RE +.IPs probesize=<value> +Maximum amount of data to probe during the detection phase. +In the case of MPEG-TS this value identifies the maximum number +of TS packets to scan. +.IPs cryptokey=<hexstring> +Encryption key the demuxer should use. +This is the raw binary data of the key converted to a hexadecimal string. +.RE +. +.TP .B \-loadidx <index file> The file from which to read the video index data saved by \-saveidx. This index will be used for seeking, overriding any index data @@ -2462,8 +2488,6 @@ intensity of the color. Force subtitle demuxer type for \-subfile. Use a '+' before the name to force it, this will skip some checks! Give the demuxer name as printed by \-sub\-demuxer help. -For backward compatibility it also accepts the demuxer ID as defined in -subreader.h. . .TP .B \-sub\-fuzziness <mode> @@ -2475,7 +2499,7 @@ exact match .IPs 1 Load all subs containing movie name. .IPs 2 -Load all subs in the current directory. +Load all subs in the current and \-sub\-paths directories. .RE .PD 1 . @@ -2542,6 +2566,31 @@ Guess the encoding for Polish, fall back on cp1250. .PD 1 . .TP +.B \-sub\-paths <path1:path2:...> +Specify extra directories where to search for subtitles matching the video. +Multiple directories can be separated by ":" (";" on Windows). +Paths can be relative or absolute. +Relative paths are interpreted relative to video file directory. + +.sp 1 +.I EXAMPLE: +Assuming that /path/\:to/\:movie/\:movie.avi is played and \-sub\-paths +sub:subtitles:/tmp/subs is specified, MPlayer searches for subtitle files in +these directories: +.RSs +/path/\:to/\:movie/ +.br +/path/\:to/\:movie/\:sub/ +.br +/path/\:to/\:movie/\:subtitles/ +.br +/tmp/\:subs/ +.br +~/.mplayer/\:sub/ +.RE +.PD 1 +. +.TP .B \-subdelay <sec> Delays subtitles by <sec> seconds. Can be negative. @@ -7689,14 +7738,6 @@ font directory (There must be a font.desc file and files with .RAW extension.) .TP ~/.mplayer/\:DVDkeys/ cached CSS keys -. -.TP -Assuming that /path/\:to/\:movie.avi is played, MPlayer searches for sub files -in this order: -.RS -/path/\:to/\:movie.sub -.br -~/.mplayer/\:sub/\:movie.sub .RE .PD 1 . |