* modules/mux/asf.c, ts.c, ogg.c: added WMV3 fourcc.

diff --git a/modules/mux/asf.c b/modules/mux/asf.c
index ad1c796ef6852c36deca900fe13ecbc76e3295ff..6601427549056a5157a346747f77c15205d0d258 100644 (file)
--- a/modules/mux/asf.c
+++ b/modules/mux/asf.c
@@ -488,6 +488,11 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
                 tk->psz_name = "Windows Media Video 2";
                 tk->i_fourcc = VLC_FOURCC( 'W', 'M', 'V', '2' );
             }
+            else if( p_input->p_fmt->i_codec == VLC_FOURCC('W','M','V','3') )
+            {
+                tk->psz_name = "Windows Media Video 3";
+                tk->i_fourcc = VLC_FOURCC( 'W', 'M', 'V', '3' );
+            }
             else
             {
                 tk->psz_name = _("Unknown Video");

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 5460769091610b66c250bcedf340e1017c16020c..a603a68e3a292509d693143f14d5af8042f10cfa 100644 (file)
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -568,6 +568,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
                 /* I didn't want to do that :P */
                 case VLC_FOURCC( 'H', '2', '6', '3' ):
                 case VLC_FOURCC( 'I', '2', '6', '3' ):
+                case VLC_FOURCC( 'W', 'M', 'V', '3' ):
                 case VLC_FOURCC( 'W', 'M', 'V', '2' ):
                 case VLC_FOURCC( 'W', 'M', 'V', '1' ):
                 case VLC_FOURCC( 'D', 'I', 'V', '3' ):

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index b8a73d714a1a62e8fca600e04c2f4ea3e3d4a630..e479dba420a996b218c70f431944335ab5f53244 100644 (file)
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -357,6 +357,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
         case VLC_FOURCC( 'M', 'J', 'P', 'G' ):
         case VLC_FOURCC( 'W', 'M', 'V', '1' ):
         case VLC_FOURCC( 'W', 'M', 'V', '2' ):
+        case VLC_FOURCC( 'W', 'M', 'V', '3' ):
             memcpy( p_stream->oggds_header.stream_type, "video", 5 );
             if( p_stream->i_fourcc == VLC_FOURCC( 'm', 'p', '4', 'v' ) )
             {