* modules/codec/ffmpeg/video_filter.c, include/vlc_filter.h:

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index 5a16758e05208b5b0dda0972937762c42f68138e..53c1336c6027c2bc812c6a74d48c6819641bb546 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -727,18 +727,21 @@ static char *ppsz_align_descriptions[] =
 #define SUBTITLE_TRACK_KEY_TEXT N_("Cycle subtitle track")
 #define SUBTITLE_TRACK_KEY_LONGTEXT N_("Cycle through the available subtitle tracks")
 
-#define PLAYLIST_USAGE N_("\nPlaylist items:" \
-    "\n  *.mpg, *.vob                   plain MPEG-1/2 files" \
-    "\n  [dvd://][device][@raw_device][@[title][,[chapter][,angle]]]" \
-    "\n                                 DVD device" \
-    "\n  [vcd://][device][@{S|T|E|P}[number]]" \
-    "\n                                 VCD device" \
-    "\n  [cdda://][device][@[T][track-number]]" \
-    "\n                                 Audio CD device" \
-    "\n  udpstream:[[<source address>]@[<bind address>][:<bind port>]]" \
-    "\n                                 UDP stream sent by a streaming server" \
-    "\n  vlc:pause                      pause execution of " \
-    "playlist items" \
+#define PLAYLIST_USAGE N_( \
+    "\nPlaylist MRL syntax:" \
+    "\n  URL[@[title][:chapter][-[title][:chapter]]] [:option=value]" \
+    "\nURL syntax:" \
+    "\n  [file://]filename              plain media file" \
+    "\n  http://ip:port/file            HTTP URL" \
+    "\n  ftp://ip:port/file             FTP URL" \
+    "\n  mms://ip:port/file             MMS URL" \
+    "\n  screen://                      Screen capture" \
+    "\n  [dvd://][device][@raw_device]  DVD device" \
+    "\n  [vcd://][device]               VCD device" \
+    "\n  [cdda://][device]              Audio CD device" \
+    "\n  udp:[[<source address>]@[<bind address>][:<bind port>]]" \
+    "\n                                 UDP stream sent by a streaming server"\
+    "\n  vlc:pause                      pause execution of playlist items" \
     "\n  vlc:quit                       quit VLC" \
     "\n")
 
@@ -1065,7 +1068,7 @@ vlc_module_begin();
 
 #else
 #   define KEY_FULLSCREEN         'f'
-#   define KEY_PLAY_PAUSE         ' '
+#   define KEY_PLAY_PAUSE         KEY_SPACE
 #   define KEY_PAUSE              KEY_UNSET
 #   define KEY_PLAY               KEY_UNSET
 #   define KEY_FASTER             '+'