Mercurial > mplayer.hg
changeset 14706:127c30674725
Mp3On4 demuxer support
Patch by Larry Ruedisueli lwr at audioresearchlabs dot com
| author | rtognimp |
|---|---|
| date | Tue, 15 Feb 2005 21:04:33 +0000 |
| parents | 7b029e07e39d |
| children | 1fbfc19c5f75 |
| files | etc/codecs.conf libmpdemux/demux_mov.c |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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"
--- 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);