aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2010-11-28 03:01:00 +0000
committerPeter Ross <pross@xvid.org>2010-11-28 03:01:00 +0000
commite8ffb2fa4c233fe5d1e0bf385bd40b27288abc8b (patch)
tree3fce4f58457797b1fd29724b0bb9978ed988fd41
parent2400730fe7b4a8edd385063c726a5a4f0b578222 (diff)
downloadffmpeg-e8ffb2fa4c233fe5d1e0bf385bd40b27288abc8b.tar.gz
Add G.722 to RIFF codec list
Originally committed as revision 25837 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 55418514bf..34c0dd36f8 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -292,6 +292,7 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ CODEC_ID_WMALOSSLESS, 0x0163 },
{ CODEC_ID_ADPCM_CT, 0x0200 },
{ CODEC_ID_ATRAC3, 0x0270 },
+ { CODEC_ID_ADPCM_G722, 0x028F },
{ CODEC_ID_IMC, 0x0401 },
{ CODEC_ID_GSM_MS, 0x1500 },
{ CODEC_ID_TRUESPEECH, 0x1501 },