Don't print an error if we are using ffmpeg's ts muxer

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 476b8f063aa6eb9262c50bce73768a9cbac99f50..d1d445d4f9bbd3b9195ba1a98b4987c61fbd713a 100644 (file)
--- 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 ) ||