Accept MP3 as an alternative to MPGA for RTP and TS.

Someone please double check that this is not bogus!

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 74c58c24be2a775465a623bcf061769fc7dcdc56..8be282f7fe820813be821ff2282ace53481454b6 100644 (file)
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -956,6 +956,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
             switch( p_input->p_fmt->i_codec )
             {
                 case VLC_FOURCC( 'm', 'p','g', 'a' ):
+                case VLC_FOURCC( 'm', 'p', '3', ' ' ):
                     p_stream->i_stream_type =
                         p_input->p_fmt->audio.i_rate >= 32000 ? 0x03 : 0x04;
                     p_stream->i_stream_id = 0xc0;

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index aded619bafb7cdda15241306ca93021962bd276f..193f0221fb0b03177f6ccfb0300ebddaaecea5c4 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -962,6 +962,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
             id->pf_packetize = rtp_packetize_l8;
             break;
         case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+        case VLC_FOURCC( 'm', 'p', '3', ' ' ):
             id->i_payload_type = 14;
             id->psz_enc = "MPA";
             id->pf_packetize = rtp_packetize_mpa;