diff options
| -rw-r--r-- | etc/codecs.conf | 8 | ||||
| -rw-r--r-- | libmpdemux/demux_real.c | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 798a4a8f81..d2330413b3 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2235,6 +2235,14 @@ audiocodec ffmp3 driver ffmpeg dll "mp3" +audiocodec ffmp3adu + info "FFmpeg MPEG layer-3 adu audio decoder" + comment "integer only" + status working + format 0x55756461 ; 'a','d','u',0x55 internal MPlayer fourcc + driver ffmpeg + dll "mp3adu" + audiocodec ffmp2 info "FFmpeg MPEG layer-1 and layer-2 audio decoder" comment "integer only" diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 3de331bfb2..86c16b89cd 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -1400,8 +1400,7 @@ void demux_open_real(demuxer_t* demuxer) #undef stream_skip #endif } -#if 0 - } else if (strstr(mimet,"X-MP3")) { + } else if (strstr(mimet,"X-MP3-draft-00")) { sh_audio_t *sh = new_sh_audio(demuxer, stream_id); /* Emulate WAVEFORMATEX struct: */ @@ -1413,7 +1412,7 @@ void demux_open_real(demuxer_t* demuxer) sh->wf->nAvgBytesPerSec = 0;//bitrate; sh->wf->nBlockAlign = 0;//frame_size; sh->wf->cbSize = 0; - sh->wf->wFormatTag = sh->format = 0x55; + sh->wf->wFormatTag = sh->format = mmioFOURCC('a','d','u',0x55); if(demuxer->audio->id==stream_id){ sh->ds=demuxer->audio; @@ -1421,7 +1420,6 @@ void demux_open_real(demuxer_t* demuxer) } ++a_streams; -#endif } else if (strstr(mimet,"x-ralf-mpeg4")) { mp_msg(MSGT_DEMUX,MSGL_ERR,"Real lossless audio not supported yet\n"); } else { |