diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-11-06 15:49:50 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-08 18:05:07 +0200 |
commit | 50d5197611355e3154ca078a1e2cd2a22bf190c4 (patch) | |
tree | edb37581c595521d76020a05d9142260dd168099 | |
parent | 5c3a8c76dfc5a43666ea220472e24fc605f34fa6 (diff) | |
download | mpv-50d5197611355e3154ca078a1e2cd2a22bf190c4.tar.bz2 mpv-50d5197611355e3154ca078a1e2cd2a22bf190c4.tar.xz |
codecs_conf, mp_taglists: Use only one fourcc for LATM
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32584 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | etc/codecs.conf | 2 | ||||
-rw-r--r-- | libmpdemux/mp_taglists.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 1a953394ef..02c6990cca 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4014,7 +4014,7 @@ audiocodec ffdv audiocodec fflatm info "FFmpeg AAC in LATM" status buggy - fourcc "LATM" ; internal MPlayer FourCC + fourcc MP4L ; internal MPlayer FourCC driver ffmpeg dll aac_latm diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index ec64136056..bb5bb12289 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -66,7 +66,7 @@ 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')}, + { CODEC_ID_AAC_LATM, MKTAG('M', 'P', '4', 'L')}, #endif { CODEC_ID_AC3, 0x2000}, { CODEC_ID_ADPCM_IMA_AMV, MKTAG('A', 'M', 'V', 'A')}, |