From e6ab052c4bd68cdb1350084b1b2710f8d0e2d37b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Tue, 11 Mar 2008 14:41:25 +0100 Subject: [PATCH] Don't print an error if we are using ffmpeg's ts muxer --- modules/stream_out/standard.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index 476b8f063a..d1d445d4f9 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -298,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 ) || -- 2.39.5