* src/misc/vlm.c: added support for the 'mux' option for VOD.

[vlc] / doc / vlm.txt

diff --git a/doc/vlm.txt b/doc/vlm.txt
index 76bb0a0c3ec2c65d671c85c28597ab3f4ce5d023..72e4950c8a4e172686998b41852fae442490ab56 100644 (file)
--- a/doc/vlm.txt
+++ b/doc/vlm.txt
@@ -102,6 +102,12 @@ Note: an element is a media or a schedule.
             If a media with "loop" option receives the "play" command
             and finally finishes to play the last input of the list, it
             will automatically restart to play the input list.
+        mux (mux_name)
+            Used for vod only.
+            Only needs to be specified if you want the elementary streams
+            to be sent encapsulated instead of raw. The (mux_name) should be
+            a fourcc describing the encapsulation type (eg. mp2t for MPEG TS,
+            or mp2t for MPEG PS).
 
     Schedule Properties Syntax:
         enabled|disabled