Commit 8c869070 authored by Gildas Bazin's avatar Gildas Bazin

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

parent 9e63dcf8
...@@ -488,6 +488,11 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -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->psz_name = "Windows Media Video 2";
tk->i_fourcc = VLC_FOURCC( 'W', 'M', 'V', '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 else
{ {
tk->psz_name = _("Unknown Video"); tk->psz_name = _("Unknown Video");
......
...@@ -568,6 +568,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -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 */ /* I didn't want to do that :P */
case VLC_FOURCC( 'H', '2', '6', '3' ): case VLC_FOURCC( 'H', '2', '6', '3' ):
case VLC_FOURCC( 'I', '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', '2' ):
case VLC_FOURCC( 'W', 'M', 'V', '1' ): case VLC_FOURCC( 'W', 'M', 'V', '1' ):
case VLC_FOURCC( 'D', 'I', 'V', '3' ): case VLC_FOURCC( 'D', 'I', 'V', '3' ):
......
...@@ -357,6 +357,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -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( 'M', 'J', 'P', 'G' ):
case VLC_FOURCC( 'W', 'M', 'V', '1' ): case VLC_FOURCC( 'W', 'M', 'V', '1' ):
case VLC_FOURCC( 'W', 'M', 'V', '2' ): case VLC_FOURCC( 'W', 'M', 'V', '2' ):
case VLC_FOURCC( 'W', 'M', 'V', '3' ):
memcpy( p_stream->oggds_header.stream_type, "video", 5 ); memcpy( p_stream->oggds_header.stream_type, "video", 5 );
if( p_stream->i_fourcc == VLC_FOURCC( 'm', 'p', '4', 'v' ) ) if( p_stream->i_fourcc == VLC_FOURCC( 'm', 'p', '4', 'v' ) )
{ {
......
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