Skip to content

V
vlc
Commit 5ae159ef authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Added 'mp3 ' fourcc to muxers.

parent f73b15f5
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
modules/mux/asf.c
View file @ 5ae159ef
...@@ -385,6 +385,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -385,6 +385,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
i_bitspersample = 0; i_bitspersample = 0;
break; break;
case VLC_FOURCC( 'm', 'p', 'g', 'a' ): case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
case VLC_FOURCC( 'm', 'p', '3', ' ' ):
#if 1 #if 1
tk->psz_name = "MPEG Audio Layer 3"; tk->psz_name = "MPEG Audio Layer 3";
tk->i_tag = WAVE_FORMAT_MPEGLAYER3; tk->i_tag = WAVE_FORMAT_MPEGLAYER3;
......
modules/mux/avi.c
View file @ 5ae159ef
...@@ -309,6 +309,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -309,6 +309,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
p_wf->wFormatTag = WAVE_FORMAT_A52; p_wf->wFormatTag = WAVE_FORMAT_A52;
break; break;
case VLC_FOURCC( 'm', 'p', 'g', 'a' ): case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
case VLC_FOURCC( 'm', 'p', '3', ' ' ):
p_wf->wFormatTag = WAVE_FORMAT_MPEGLAYER3; p_wf->wFormatTag = WAVE_FORMAT_MPEGLAYER3;
break; break;
case VLC_FOURCC( 'w', 'm', 'a', '1' ): case VLC_FOURCC( 'w', 'm', 'a', '1' ):
......
modules/mux/mp4.c
View file @ 5ae159ef
...@@ -400,6 +400,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -400,6 +400,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
case VLC_FOURCC( 'm', 'p', '4', 'a' ): case VLC_FOURCC( 'm', 'p', '4', 'a' ):
case VLC_FOURCC( 'm', 'p', '4', 'v' ): case VLC_FOURCC( 'm', 'p', '4', 'v' ):
case VLC_FOURCC( 'm', 'p', 'g', 'a' ): case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
case VLC_FOURCC( 'm', 'p', '3', ' ' ):
case VLC_FOURCC( 'm', 'p', 'g', 'v' ): case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
case VLC_FOURCC( 'M', 'J', 'P', 'G' ): case VLC_FOURCC( 'M', 'J', 'P', 'G' ):
case VLC_FOURCC( 'm', 'j', 'p', 'b' ): case VLC_FOURCC( 'm', 'j', 'p', 'b' ):
...@@ -793,6 +794,7 @@ static bo_t *GetESDS( mp4_stream_t *p_stream ) ...@@ -793,6 +794,7 @@ static bo_t *GetESDS( mp4_stream_t *p_stream )
i_object_type_indication = 0x40; i_object_type_indication = 0x40;
break; break;
case VLC_FOURCC( 'm', 'p', 'g', 'a' ): case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
case VLC_FOURCC( 'm', 'p', '3', ' ' ):
i_object_type_indication = i_object_type_indication =
p_stream->fmt.audio.i_rate < 32000 ? 0x69 : 0x6b; p_stream->fmt.audio.i_rate < 32000 ? 0x69 : 0x6b;
break; break;
...@@ -1105,6 +1107,7 @@ static bo_t *GetSounBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) ...@@ -1105,6 +1107,7 @@ static bo_t *GetSounBox( sout_mux_t *p_mux, mp4_stream_t *p_stream )
break; break;
case VLC_FOURCC('m','p','g','a'): case VLC_FOURCC('m','p','g','a'):
case VLC_FOURCC('m','p','3',' '):
if( p_sys->b_mov ) if( p_sys->b_mov )
memcpy( fcc, ".mp3", 4 ); memcpy( fcc, ".mp3", 4 );
else else
......
modules/mux/mpeg/ps.c
View file @ 5ae159ef
...@@ -310,6 +310,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -310,6 +310,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
0xbd00 | StreamIdGet( p_sys->stream_id_a52, 0x80, 0x87 ); 0xbd00 | StreamIdGet( p_sys->stream_id_a52, 0x80, 0x87 );
break; break;
case VLC_FOURCC( 'm', 'p', 'g', 'a' ): case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
case VLC_FOURCC( 'm', 'p', '3', ' ' ):
p_stream->i_stream_id = p_stream->i_stream_id =
StreamIdGet( p_sys->stream_id_mpga, 0xc0, 0xcf ); StreamIdGet( p_sys->stream_id_mpga, 0xc0, 0xcf );
p_stream->i_stream_type = 0x03; /* ISO/IEC 11172 Audio */ p_stream->i_stream_type = 0x03; /* ISO/IEC 11172 Audio */
......
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