summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorLeo Izen <leo.izen@gmail.com>2017-12-04 12:30:22 -0500
committerLeo Izen <leo.izen@gmail.com>2017-12-04 12:34:02 -0500
commitfdc311625ec016a685143097c3dc5e352c08b5d9 (patch)
treeffe9f14f3a3a2dfc6b30a19c42721528caccc85c /DOCS
parent9abb710afb8e369eeb3104156c731bd3564abfcd (diff)
downloadmpv-fdc311625ec016a685143097c3dc5e352c08b5d9.tar.bz2
mpv-fdc311625ec016a685143097c3dc5e352c08b5d9.tar.xz
player/misc.c: allow both --length and --end to control play endpoint
Most options that change the playback endpoint coexist and playback stops when it reaches any of them. (e.g. --ab-loop-b, --end, or --chapter). This patch extends that behavior to --length so it isn't automatically trumped by --end if both are present. These two will interact now as the other options do. This change is also documented in DOCS/man/options.rst.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/options.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 7cfd1f9e3c..2807cad44d 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -133,6 +133,9 @@ Playback Control
Stop after a given time relative to the start time.
See ``--start`` for valid option values and examples.
+ If both ``--end`` and ``--length`` are provided, playback will stop when it
+ reaches either of the two endpoints.
+
``--rebase-start-time=<yes|no>``
Whether to move the file start time to ``00:00:00`` (default: yes). This
is less awkward for files which start at a random timestamp, such as