Make the video transcoder support filter chains that output multiple frames

[vlc] / modules / stream_out / vod.c

diff --git a/modules/stream_out/vod.c b/modules/stream_out/vod.c
index 61e8bacb20e82968745a852d2ba199f0ef7276ab..41c8d254253babfd4b3e28d08b29325a4b1f5f8c 100644 (file)
--- a/modules/stream_out/vod.c
+++ b/modules/stream_out/vod.c
@@ -146,27 +146,6 @@ int OpenVoD( vlc_object_t *p_this )
         else
             p_sys->psz_rtsp_path = strdup( url.psz_path );
 
-        /* if( url.psz_host != NULL && *url.psz_host )
-        {
-            msg_Err( p_vod, "\"%s\" RTSP host ignored", url.psz_host );
-            msg_Info( p_vod, "Pass --rtsp-host=%s on the command line "
-                      "instead.", url.psz_host );
-        } */
-
-        var_Create( p_vod, "rtsp-host", VLC_VAR_STRING );
-        var_SetString( p_vod, "rtsp-host", url.psz_host );
-
-        /* if( url.i_port != 0 )
-        {
-            msg_Err( p_vod, "\"%u\" RTSP port ignored", url.i_port );
-            msg_Info( p_vod, "Pass --rtsp-port=%u on the command line "
-                      "instead.", url.i_port );
-        } */
-
-        if( url.i_port <= 0 ) url.i_port = 554;
-        var_Create( p_vod, "rtsp-port", VLC_VAR_INTEGER );
-        var_SetInteger( p_vod, "rtsp-port", url.i_port );
-
         vlc_UrlClean( &url );
     }
 
@@ -360,7 +339,7 @@ static void CommandPush( vod_t *p_vod, rtsp_cmd_type_t i_type,
     else
         cmd.psz_arg = NULL;
 
-    p_cmd = block_New( p_vod, sizeof(rtsp_cmd_t) );
+    p_cmd = block_Alloc( sizeof(rtsp_cmd_t) );
     memcpy( p_cmd->p_buffer, &cmd, sizeof(cmd) );
 
     block_FifoPut( p_vod->p_sys->p_fifo_cmd, p_cmd );