RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

codecs.conf, mp_taglists: Support FFmpeg LATM decoding 

Also move libfaad codecs.conf entry into the same position as in svn
(no functionality change since ffaac is marked buggy so only faad is
used by default regardless or order).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32571 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
cehoyos 2010-11-02 14:17:05 +00:00 committed by Uoti Urpala
parent ffbc561f96
commit 0a2d29a75b
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
etc/codecs.conf
View File

@ -4011,21 +4011,12 @@ audiocodec ffdv
driver ffmpeg
dll "dvaudio"
audiocodec faad
info "FAAD AAC (MPEG-2/MPEG-4 Audio)"
status working
fourcc mp4a,MP4A,MP4L
fourcc "VLB " ; Used in NSV, not really working
fourcc "AAC " ; Used in NSV
fourcc "AACP" ; Used in NSV for AACPlus
fourcc raac,racp
format 0xff
format 0x706D
format 0x4143 ; aac in asf
format 0xA106 ; aac in avi
format 0xAAC0 ; Borgtech nonsense tag
driver faad
dll libfaad2
audiocodec fflatm
info "FFmpeg AAC in LATM"
status buggy
fourcc "LATM" ; internal MPlayer FourCC
driver ffmpeg
dll aac_latm
audiocodec ffaac
info "FFmpeg AAC (MPEG-2/MPEG-4 Audio)"
@ -4115,6 +4106,22 @@ audiocodec ffnellymoser
driver ffmpeg
dll "nellymoser"
audiocodec faad
info "FAAD AAC (MPEG-2/MPEG-4 Audio)"
status working
fourcc mp4a,MP4A,MP4L
fourcc "VLB " ; Used in NSV, not really working
fourcc "AAC " ; Used in NSV
fourcc "AACP" ; Used in NSV for AACPlus
fourcc raac,racp
format 0xff
format 0x706D
format 0x4143 ; aac in asf
format 0xA106 ; aac in avi
format 0xAAC0 ; Borgtech nonsense tag
driver faad
dll libfaad2
audiocodec pcm
info "Uncompressed PCM"
status working

3
libmpdemux/mp_taglists.c
View File

@ -65,6 +65,9 @@ const struct mp_AVCodecTag * const mp_wav_taglists[] = {mp_ff_codec_wav_tags, mp
static const struct mp_AVCodecTag mp_codecid_override_tags[] = {
{ CODEC_ID_AAC, MKTAG('M', 'P', '4', 'A')},
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 0)
{ CODEC_ID_AAC_LATM, MKTAG('L', 'A', 'T', 'M')},
#endif
{ CODEC_ID_AC3, 0x2000},
{ CODEC_ID_ADPCM_IMA_AMV, MKTAG('A', 'M', 'V', 'A')},
{ CODEC_ID_DTS, 0x2001},