? libmpcodecs/ad_mp3on4.c
Index: etc/codecs.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v
retrieving revision 1.360
diff -u -r1.360 codecs.conf
--- etc/codecs.conf	16 Sep 2004 19:42:54 -0000	1.360
+++ etc/codecs.conf	21 Sep 2004 14:43:53 -0000
@@ -2145,6 +2145,14 @@
   driver ffmpeg
   dll "sonic"
 
+audiocodec mp3on4
+  info "Multi-channel MPEG layer-3 on MP4 audio decoder"
+  comment "uses ffmpeg mp3 decoder"
+  status working
+  format 29
+  driver mp3on4
+  dll "mp3"
+
 audiocodec ffmp3
   info "FFmpeg MPEG layer-3 audio decoder"
   comment "integer only"
Index: libmpcodecs/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.135
diff -u -r1.135 Makefile
--- libmpcodecs/Makefile	11 Sep 2004 13:08:34 -0000	1.135
+++ libmpcodecs/Makefile	21 Sep 2004 14:43:55 -0000
@@ -6,7 +6,7 @@
 
 AUDIO_SRCS_LIB=ad_liba52.c ad_hwac3.c ad_mp3lib.c
 AUDIO_SRCS_NAT=ad_alaw.c ad_dk3adpcm.c ad_pcm.c ad_dvdpcm.c ad_imaadpcm.c ad_msadpcm.c ad_msgsm.c ad_ra1428.c
-AUDIO_SRCS_OPT=ad_acm.c ad_dshow.c ad_dmo.c ad_qtaudio.c ad_ffmpeg.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c
+AUDIO_SRCS_OPT=ad_acm.c ad_dshow.c ad_dmo.c ad_qtaudio.c ad_ffmpeg.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c ad_mp3on4.c
 AUDIO_SRCS=dec_audio.c ad.c $(AUDIO_SRCS_LIB) $(AUDIO_SRCS_NAT) $(AUDIO_SRCS_OPT)
 
 VIDEO_SRCS_LIB=vd_libmpeg2.c vd_nuv.c vd_lzo.c
Index: libmpcodecs/ad.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad.c,v
retrieving revision 1.19
diff -u -r1.19 ad.c
--- libmpcodecs/ad.c	15 Jul 2004 20:36:04 -0000	1.19
+++ libmpcodecs/ad.c	21 Sep 2004 14:43:55 -0000
@@ -18,6 +18,7 @@
 //extern ad_functions_t mpcodecs_ad_null;
 extern ad_functions_t mpcodecs_ad_mp3lib;
 extern ad_functions_t mpcodecs_ad_ffmpeg;
+extern ad_functions_t mpcodecs_ad_mp3on4;
 extern ad_functions_t mpcodecs_ad_liba52;
 extern ad_functions_t mpcodecs_ad_hwac3;
 extern ad_functions_t mpcodecs_ad_pcm;
@@ -51,6 +52,7 @@
 #endif
 #ifdef USE_LIBAVCODEC
   &mpcodecs_ad_ffmpeg,
+  &mpcodecs_ad_mp3on4,
 #endif
   &mpcodecs_ad_pcm,
   &mpcodecs_ad_dvdpcm,
Index: libmpdemux/demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.108
diff -u -r1.108 demux_mov.c
--- libmpdemux/demux_mov.c	13 Sep 2004 21:21:47 -0000	1.108
+++ libmpdemux/demux_mov.c	21 Sep 2004 14:43:56 -0000
@@ -951,6 +951,8 @@
 
 			    // dump away the codec specific configuration for the AAC decoder
 			    if(esds.decoderConfigLen){
+			    if( (esds.decoderConfig[0]>>3) == 29 )
+			    	sh->format = 29; // 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);