From 0a2d29a75b80c003519f48bca2abbac2092bd2f6 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Tue, 2 Nov 2010 14:17:05 +0000 Subject: 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 --- libmpdemux/mp_taglists.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libmpdemux/mp_taglists.c') diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 7fc68db5f9..ec64136056 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -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}, -- cgit v1.2.3