- contribs: fixed live555 patch

[vlc] / modules / stream_out / standard.c

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 1768cc33911f3194dc7afe0672a2fc55491c27ba..ba4463932ddcd799a2a1350788ae5dfd57e92cc7 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * standard.c: standard stream output module
  *****************************************************************************
- * Copyright (C) 2003-2004 the VideoLAN team
+ * Copyright (C) 2003-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -38,17 +38,14 @@
  * Module descriptor
  *****************************************************************************/
 #define ACCESS_TEXT N_("Output access method")
-/// \bug [String] "Output method to use for the stream." 
 #define ACCESS_LONGTEXT N_( \
-    "This is the output access method that will be used." )
+    "Output method to use for the stream." )
 #define MUX_TEXT N_("Output muxer")
-/// \bug [String] "Muxer to use for the stream." 
 #define MUX_LONGTEXT N_( \
-    "This is the muxer that will be used." )
+    "Muxer to use for the stream." )
 #define DST_TEXT N_("Output destination")
-/// \bug [String] "Destination (URL) to use for the stream." 
 #define DST_LONGTEXT N_( \
-    "This is the destination (URL) that will be used for the stream." )
+    "Destination (URL) to use for the stream." )
 #define NAME_TEXT N_("Session name")
 #define NAME_LONGTEXT N_( \
   "This allows you to specify a name for the session, that will be announced "\
@@ -203,6 +200,7 @@ static int Open( vlc_object_t *p_this )
             { "ps",  "ps" },
             { "mpeg1","mpeg1" },
             { "wav","wav" },
+            { "flv", "ffmpeg{mux=flv}" },
             { NULL,  NULL }
         };
         const char *psz_ext = strrchr( psz_url, '.' ) + 1;