Skip to content

V
vlc-1.1
Commit 8764d2a1 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

sout-std: remove RTP stuff (since we don't have a RTP access output)

parent 8e65c917
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
modules/stream_out/standard.c
View file @ 8764d2a1
...@@ -284,8 +284,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -284,8 +284,7 @@ static int Open( vlc_object_t *p_this )
{ {
psz_mux = strdup("asfh"); psz_mux = strdup("asfh");
} }
else if (!strcmp (psz_access, "udp") else if (!strcmp (psz_access, "udp"))
|| !strcmp (psz_access, "rtp"))
{ {
psz_mux = strdup("ts"); psz_mux = strdup("ts");
} }
...@@ -333,19 +332,18 @@ static int Open( vlc_object_t *p_this ) ...@@ -333,19 +332,18 @@ static int Open( vlc_object_t *p_this )
psz_mux = strdup("asfh"); psz_mux = strdup("asfh");
} }
} }
else if( ( !strncmp( psz_access, "rtp", 3 ) || else if( !strncmp( psz_access, "udp", 3 ) )
!strncmp( psz_access, "udp", 3 ) ) )
{ {
if( !strncmp( psz_mux, "ffmpeg", 6 ) ) if( !strncmp( psz_mux, "ffmpeg", 6 ) )
{ /* why would you use ffmpeg's ts muxer ? YOU DON'T LOVE VLC ??? */ { /* why would you use ffmpeg's ts muxer ? YOU DON'T LOVE VLC ??? */
char *psz_ffmpeg_mux = var_CreateGetString( p_this, "ffmpeg-mux" ); char *psz_ffmpeg_mux = var_CreateGetString( p_this, "ffmpeg-mux" );
if( !psz_ffmpeg_mux || strncmp( psz_ffmpeg_mux, "mpegts", 6 ) ) 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 ); free( psz_ffmpeg_mux );
} }
else if( strncmp( psz_mux, "ts", 2 ) ) 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 ) && else if( strncmp( psz_access, "file", 4 ) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment