[vlc-devel] commit: sout-std: remove RTP stuff (since we don't have a RTP access output ) ( Rémi Denis-Courmont )
git version control
git at videolan.org
Wed May 7 16:56:27 CEST 2008
vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Wed May 7 17:34:24 2008 +0300| [8764d2a1a6b555eaaeec81bc953cc723608f5ebf]
sout-std: remove RTP stuff (since we don't have a RTP access output)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8764d2a1a6b555eaaeec81bc953cc723608f5ebf
---
modules/stream_out/standard.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index b4c14c7..f8a0cc6 100644
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -284,8 +284,7 @@ static int Open( vlc_object_t *p_this )
{
psz_mux = strdup("asfh");
}
- else if (!strcmp (psz_access, "udp")
- || !strcmp (psz_access, "rtp"))
+ else if (!strcmp (psz_access, "udp"))
{
psz_mux = strdup("ts");
}
@@ -333,19 +332,18 @@ static int Open( vlc_object_t *p_this )
psz_mux = strdup("asfh");
}
}
- else if( ( !strncmp( psz_access, "rtp", 3 ) ||
- !strncmp( psz_access, "udp", 3 ) ) )
+ else if( !strncmp( psz_access, "udp", 3 ) )
{
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" );
+ msg_Err( p_stream, "UDP is 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" );
+ msg_Err( p_stream, "UDP is only valid with TS" );
}
}
else if( strncmp( psz_access, "file", 4 ) &&
More information about the vlc-devel
mailing list