From 04bdd7af72aa9ab5aa81e38ca85d3f40e76f16d4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 19 Nov 2013 22:26:35 +0100 Subject: timeline: add edl:// URIs Questionable change from user perspective, but internally needed to implement the next commit. Also useful for testing timeline stuff. --- DOCS/edl-mpv.rst | 9 +++++++++ DOCS/man/en/mpv.rst | 1 + 2 files changed, 10 insertions(+) (limited to 'DOCS') diff --git a/DOCS/edl-mpv.rst b/DOCS/edl-mpv.rst index 611182b003..4bdf5f7e0b 100644 --- a/DOCS/edl-mpv.rst +++ b/DOCS/edl-mpv.rst @@ -92,3 +92,12 @@ to ``20``, ``param3`` to ``value,escaped``, ``param4`` to ``value2``. Instead of line breaks, the character ``;`` can be used. Line feed bytes and ``;`` are treated equally. + +Syntax of EDL URIs +================== + +mpv accepts ``inline`` EDL data in form of ``edl://`` URIs. Other than the +header, the syntax is exactly the same. It's far more convenient to use ``;`` +instead of line breaks, but that is orthogonal. + +Example: ``edl://f1.mkv,length=5,start=10;f2.mkv,30,20;f3.mkv`` diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst index 0ee64d41b6..da59041d7d 100644 --- a/DOCS/man/en/mpv.rst +++ b/DOCS/man/en/mpv.rst @@ -32,6 +32,7 @@ SYNOPSIS | **mpv** \mf://[filemask|\@listfile] [-mf options] [options] | **mpv** cdda://track[-endtrack][:speed][/device] [options] | **mpv** [file|mms[t]|http|httpproxy|rt[s]p|ftp|udp|smb]://[user:pass\@]URL[:port] [options] +| **mpv** edl://[edl specification as in edl-mpv.rst] DESCRIPTION -- cgit v1.2.3