[vlc-commits] doc: don't include accidental functionality

Thomas Guillem git at videolan.org
Tue Dec 6 19:12:57 CET 2016


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Dec  6 19:12:16 2016 +0100| [ee1b1813406f81763749356ded9d7053e902ab3a] | committer: Thomas Guillem

doc: don't include accidental functionality

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ee1b1813406f81763749356ded9d7053e902ab3a
---

 doc/standalone/mrl.dox | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/doc/standalone/mrl.dox b/doc/standalone/mrl.dox
index e7df916..59365a2 100644
--- a/doc/standalone/mrl.dox
+++ b/doc/standalone/mrl.dox
@@ -17,7 +17,7 @@
  * demux is to be unconditionally used for a specific resource, such as in the
  * below (forcing usage of \em demuxdump).
  *
- * \verbatim http/demuxdump,none://example.com/path/to/media\endverbatim
+ * \verbatim http/demuxdump://example.com/path/to/media\endverbatim
  *
  * There is also the possibility of specifying attributes related to the
  * playback behavior of the referred to resource, such as what range of titles
@@ -44,18 +44,9 @@
  *
  *     mrl-scheme   = *( %x20-7E )
  *     mrl-demux    = *( %x20-2B / %x2D-7E )
- *     mrl-demuxers = mrl-demux *( "," mrl-demux )
- *     scheme       =/ ( mrl-scheme [ "/" mrl-demuxers ] )
+ *     scheme       =/ ( mrl-scheme [ "/" mrl-demux ] )
  *
- *  - `mrl-demuxers` is a \em comma-delimited list of individual \ref
- *    demux that will be tried in order of appearance when the
- *    resource requires a \ref demux to be created.
- *
- *  - If the currently processed `mrl-demux` is `"any"`
- *    (case-insensitive), than any \ref demux is allowed to be probed
- *    (and potentially used) at that stage.
- *
- *  - If no specified \ref demux specified in `mrl-demuxers` can
+ *  - If the specified \ref demux specified in `mrl-demuxer` can't
  *    handle the resource, the media shall fail to open.
  *
  * \subsection mrl_technical_fragment 3.5. Fragment



More information about the vlc-commits mailing list