diff options
| author | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-15 21:04:33 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-15 21:04:33 +0000 |
| commit | a6c469e97f551a73663c4afd0e3ac018201d7f9f (patch) | |
| tree | 337a0b5571d7b74dfb8c2f5bfa25185f9c02740a | |
| parent | d2e4443de6fd049cefff3bc18b66b06e8531a008 (diff) | |
| download | mpv-a6c469e97f551a73663c4afd0e3ac018201d7f9f.tar.bz2 mpv-a6c469e97f551a73663c4afd0e3ac018201d7f9f.tar.xz | |
Mp3On4 demuxer support
Patch by Larry Ruedisueli lwr at audioresearchlabs dot com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14707 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 7 | ||||
| -rw-r--r-- | libmpdemux/demux_mov.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 2a1993b892..6031d20697 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2252,6 +2252,13 @@ audiocodec ffsonic 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 --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 9ac2994596..13a6a81b60 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -973,6 +973,8 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak // 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); |