diff options
author | Peter Ross <pross@xvid.org> | 2011-01-09 05:11:41 +0300 |
---|---|---|
committer | Peter Ross <pross@xvid.org> | 2011-01-09 05:11:41 +0300 |
commit | 50d83b20058fd9564c0c41675717d2a87c36409b (patch) | |
tree | 2213b3cea1ab6c459550e73a414ad86f2a212565 /libavformat/riff.c | |
parent | 14207fd23eba3671ca3d5b935240701bc47c9a2b (diff) |
Add audio codec 0x1602 (AAC LATM)
Originally committed as revision 26273 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r-- | libavformat/riff.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 7388f9cee7..4edccced99 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -298,6 +298,7 @@ const AVCodecTag ff_codec_wav_tags[] = { { CODEC_ID_IMC, 0x0401 }, { CODEC_ID_GSM_MS, 0x1500 }, { CODEC_ID_TRUESPEECH, 0x1501 }, + { CODEC_ID_AAC_LATM, 0x1602 }, { CODEC_ID_AC3, 0x2000 }, { CODEC_ID_DTS, 0x2001 }, { CODEC_ID_SONIC, 0x2048 }, @@ -515,6 +516,11 @@ void ff_get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size) url_fskip(pb, size); } codec->codec_id = ff_wav_codec_get_id(id, codec->bits_per_coded_sample); + if (codec->codec_id == CODEC_ID_AAC_LATM) { + /* channels and sample_rate values are those prior to applying SBR and/or PS */ + codec->channels = 0; + codec->sample_rate = 0; + } } |