From d585382f0ef9cf6c8e5e481bb2f4f18a30feca59 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 21 Nov 2013 15:59:00 +0100 Subject: timeline: reject mplayer2 EDL files, change EDL header This was forgotten when the parser for mplayer2 EDL files was removed. Change the header of the mpv EDL format to include a '#', so a naive parser could skip the header as comment. (Maybe this is questionable; on the other hand, if it can be simpler, why not.) Also, strip the header in demux_edl.c before passing on the data, so the header check doesn't need to be duplicated in tl_mpv_edl.c. --- DOCS/edl-mpv.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'DOCS/edl-mpv.rst') diff --git a/DOCS/edl-mpv.rst b/DOCS/edl-mpv.rst index 4bdf5f7e0b..e53c73767b 100644 --- a/DOCS/edl-mpv.rst +++ b/DOCS/edl-mpv.rst @@ -7,7 +7,7 @@ segment, and consists of source file, source offset, and segment length. For example:: - mpv EDL v0 + # mpv EDL v0 f1.mkv,10,20 f2.mkv f1.mkv,40,10 @@ -21,6 +21,7 @@ virtual EDL file appears as a single file, instead as a playlist. The general simplified syntax is: + # mpv EDL v0 ,, @@ -40,7 +41,7 @@ Syntax of mpv EDL files Generally, the format is relatively strict. No superfluous whitespace (except empty lines and commented lines) are allowed. You must use UNIX line breaks. -The first line in the file must be ``mpv EDL v0``. This designates that the +The first line in the file must be ``# mpv EDL v0``. This designates that the file uses format version 0, which is not frozen yet and may change any time. (If you need a stable EDL file format, make a feature request. Likewise, if you have suggestions for improvements, it's not too late yet.) @@ -84,7 +85,7 @@ implicitly uses the name ``start``. Example:: - mpv EDL v0 + # mpv EDL v0 %18%filename,with,.mkv,10,length=20,param3=%13%value,escaped,param4=value2 this sets ``file`` to ``filename,with,.mkv``, ``start`` to ``10``, ``length`` -- cgit v1.2.3