[vlc-devel] commit: Don't print an error if we are using ffmpeg's ts muxer ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Mar 11 14:41:25 2008 +0100| [e6ab052c4bd68cdb1350084b1b2710f8d0e2d37b]

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e6ab052c4bd68cdb1350084b1b2710f8d0e2d37b
---

 modules/stream_out/standard.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 476b8f0..d1d445d 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 ) ||