Revert "dummy .empty files added for needed folders"

[vlc] / modules / stream_out / standard.c

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 477537c605a3a07864328ac5a3e40d66c61dc70d..bfa13a5bf0ec2def3ec69b25bb7d3e92deac95e7 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -24,10 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_sout.h>
 
-
 #include <vlc_network.h>
 #include "vlc_url.h"
 
@@ -40,8 +43,8 @@
 #define MUX_TEXT N_("Output muxer")
 #define MUX_LONGTEXT N_( \
     "Muxer to use for the stream." )
-#define DST_TEXT N_("Output destination")
-#define DST_LONGTEXT N_( \
+#define DEST_TEXT N_("Output destination")
+#define DEST_LONGTEXT N_( \
     "Destination (URL) to use for the stream." )
 #define NAME_TEXT N_("Session name")
 #define NAME_LONGTEXT N_( \
@@ -53,7 +56,7 @@
   "This allows you to specify a group for the session, that will be announced "\
   "if you choose to use SAP." )
 
-#define DESC_TEXT N_("Session descriptipn")
+#define DESC_TEXT N_("Session description")
 #define DESC_LONGTEXT N_( \
     "This allows you to give a short description with details about the stream, " \
     "that will be announced in the SDP (Session Descriptor)." )
@@ -93,8 +96,9 @@ vlc_module_begin();
                 ACCESS_LONGTEXT, VLC_FALSE );
     add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
                 MUX_LONGTEXT, VLC_FALSE );
-    add_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT,
-                DST_LONGTEXT, VLC_FALSE );
+    add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
+                DEST_LONGTEXT, VLC_FALSE );
+        change_unsafe();
 
     add_bool( SOUT_CFG_PREFIX "sap", VLC_FALSE, NULL, SAP_TEXT, SAP_LONGTEXT,
               VLC_TRUE );
@@ -167,12 +171,12 @@ static int Open( vlc_object_t *p_this )
     psz_mux = *val.psz_string ? val.psz_string : NULL;
     if( !*val.psz_string ) free( val.psz_string );
 
-
     var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val );
     psz_url = *val.psz_string ? val.psz_string : NULL;
     if( !*val.psz_string ) free( val.psz_string );
 
     p_sys = p_stream->p_sys = malloc( sizeof( sout_stream_sys_t) );
+    if( !p_sys ) return VLC_ENOMEM;
     p_stream->p_sys->p_session = NULL;
 
     msg_Dbg( p_this, "creating `%s/%s://%s'", psz_access, psz_mux, psz_url );
@@ -294,10 +298,19 @@ static int Open( vlc_object_t *p_this )
         }
     }
     else if( ( !strncmp( psz_access, "rtp", 3 ) ||
-               !strncmp( psz_access, "udp", 3 ) ) &&
-             strncmp( psz_mux, "ts", 2 ) )
+               !strncmp( psz_access, "udp", 3 ) ) )
     {
-        msg_Err( p_stream, "UDP and RTP are only valid with TS" );
+        if( !strncmp( psz_mux, "ffmpeg", 6 ) )
+        {   /* why would you use ffmpeg's ts muxer ? YOU DON'T LOVE VLC ??? */
+            char *psz_ffmpeg_mux = var_CreateGetString( p_this, "ffmpeg-mux" );
+            if( !psz_ffmpeg_mux || strncmp( psz_ffmpeg_mux, "mpegts", 6 ) )
+                msg_Err( p_stream, "UDP and RTP are only valid with TS" );
+            free( psz_ffmpeg_mux );
+        }
+        else if( strncmp( psz_mux, "ts", 2 ) )
+        {
+            msg_Err( p_stream, "UDP and RTP are only valid with TS" );
+        }
     }
     else if( strncmp( psz_access, "file", 4 ) &&
              ( !strncmp( psz_mux, "mov", 3 ) ||
@@ -379,8 +392,7 @@ static int Open( vlc_object_t *p_this )
             msg_Dbg (p_stream, "Generated SDP:\n%s", psz_sdp);
 
             p_sys->p_session =
-                sout_AnnounceRegisterSDP (p_sout, SOUT_CFG_PREFIX, psz_sdp,
-                                          dhost, p_method);
+                sout_AnnounceRegisterSDP (p_sout, psz_sdp, dhost, p_method);
             sout_MethodRelease (p_method);
         }
         free (dhost);