[vlc-devel] commit: Added 'mp3 ' fourcc to muxers. (Laurent Aimar )

[git version control]

vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Sat Jul 11 21:23:46 2009 +0200| [5ae159ef8e9c7aba69bf979cce34388aadd094b4] | committer: Laurent Aimar 

Added 'mp3 ' fourcc to muxers.

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

 modules/mux/asf.c     |    1 +
 modules/mux/avi.c     |    1 +
 modules/mux/mp4.c     |    3 +++
 modules/mux/mpeg/ps.c |    1 +
 4 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/modules/mux/asf.c b/modules/mux/asf.c
index 332cae8..5c9c4bf 100644
--- a/modules/mux/asf.c
+++ b/modules/mux/asf.c
@@ -385,6 +385,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
                     i_bitspersample = 0;
                     break;
                 case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+                case VLC_FOURCC( 'm', 'p', '3', ' ' ):
 #if 1
                     tk->psz_name = "MPEG Audio Layer 3";
                     tk->i_tag = WAVE_FORMAT_MPEGLAYER3;
diff --git a/modules/mux/avi.c b/modules/mux/avi.c
index e70e5dd..2e7cb9f 100644
--- a/modules/mux/avi.c
+++ b/modules/mux/avi.c
@@ -309,6 +309,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
                     p_wf->wFormatTag = WAVE_FORMAT_A52;
                     break;
                 case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+                case VLC_FOURCC( 'm', 'p', '3', ' ' ):
                     p_wf->wFormatTag = WAVE_FORMAT_MPEGLAYER3;
                     break;
                 case VLC_FOURCC( 'w', 'm', 'a', '1' ):
diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index 92a251f..3001fbd 100644
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -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', 'v' ):
         case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+        case VLC_FOURCC( 'm', 'p', '3', ' ' ):
         case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
         case VLC_FOURCC( 'M', 'J', 'P', 'G' ):
         case VLC_FOURCC( 'm', 'j', 'p', 'b' ):
@@ -793,6 +794,7 @@ static bo_t *GetESDS( mp4_stream_t *p_stream )
             i_object_type_indication = 0x40;
             break;
         case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+        case VLC_FOURCC( 'm', 'p', '3', ' ' ):
             i_object_type_indication =
                 p_stream->fmt.audio.i_rate < 32000 ? 0x69 : 0x6b;
             break;
@@ -1105,6 +1107,7 @@ static bo_t *GetSounBox( sout_mux_t *p_mux, mp4_stream_t *p_stream )
         break;
 
     case VLC_FOURCC('m','p','g','a'):
+    case VLC_FOURCC('m','p','3',' '):
         if( p_sys->b_mov )
             memcpy( fcc, ".mp3", 4 );
         else
diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c
index 0f5667d..f2ec618 100644
--- a/modules/mux/mpeg/ps.c
+++ b/modules/mux/mpeg/ps.c
@@ -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 );
             break;
         case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+        case VLC_FOURCC( 'm', 'p', '3', ' ' ):
             p_stream->i_stream_id =
                 StreamIdGet( p_sys->stream_id_mpga, 0xc0, 0xcf );
             p_stream->i_stream_type = 0x03; /* ISO/IEC 11172 Audio */