# HG changeset patch
# User rtognimp
# Date 1108501473 0
# Node ID 127c306747253ec5630916998b277d375cfcf87b
# Parent  7b029e07e39d84cca7454f538785d2b4e7fe23c4
Mp3On4 demuxer support
Patch by Larry Ruedisueli lwr at audioresearchlabs dot com

diff -r 7b029e07e39d -r 127c30674725 etc/codecs.conf
--- a/etc/codecs.conf	Tue Feb 15 20:51:28 2005 +0000
+++ b/etc/codecs.conf	Tue Feb 15 21:04:33 2005 +0000
@@ -2252,6 +2252,13 @@
   driver ffmpeg
   dll "sonic"
 
+audiocodec ffmp3on4
+  info "FFmpeg Multi-channel MPEG layer-3 on MP4 audio decoder"
+  status working
+  format 0x1d61346d ; 'm','4','a',29 internal MPlayer fourcc
+  driver ffmpeg
+  dll "mp3on4"
+
 audiocodec ffmp3
   info "FFmpeg MPEG layer-3 audio decoder"
   comment "integer only"
diff -r 7b029e07e39d -r 127c30674725 libmpdemux/demux_mov.c
--- a/libmpdemux/demux_mov.c	Tue Feb 15 20:51:28 2005 +0000
+++ b/libmpdemux/demux_mov.c	Tue Feb 15 21:04:33 2005 +0000
@@ -973,6 +973,8 @@
 
 			    // dump away the codec specific configuration for the AAC decoder
 			    if(esds.decoderConfigLen){
+			    if( (esds.decoderConfig[0]>>3) == 29 )
+			    	sh->format = 0x1d61346d; // request multi-channel mp3 decoder
 			    sh->codecdata_len = esds.decoderConfigLen;
 			    sh->codecdata = (unsigned char *)malloc(sh->codecdata_len);
 			    memcpy(sh->codecdata, esds.decoderConfig, sh->codecdata_len);