[FFmpeg-cvslog] Support decoding G.722 in aiff.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Jun  9 01:10:36 2013 +0200| [c153ea4756ce41b9d09f864972b3bffe0ac0b8d4] | committer: Carl Eugen Hoyos

Support decoding G.722 in aiff.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c153ea4756ce41b9d09f864972b3bffe0ac0b8d4
---

 libavformat/aiff.h    |    1 +
 libavformat/aiffdec.c |    1 +
 2 files changed, 2 insertions(+)

diff --git a/libavformat/aiff.h b/libavformat/aiff.h
index b3ef577..c13bcc0 100644
--- a/libavformat/aiff.h
+++ b/libavformat/aiff.h
@@ -45,6 +45,7 @@ static const AVCodecTag ff_codec_aiff_tags[] = {
     { AV_CODEC_ID_MACE3,        MKTAG('M','A','C','3') },
     { AV_CODEC_ID_MACE6,        MKTAG('M','A','C','6') },
     { AV_CODEC_ID_GSM,          MKTAG('G','S','M',' ') },
+    { AV_CODEC_ID_ADPCM_G722,   MKTAG('G','7','2','2') },
     { AV_CODEC_ID_ADPCM_G726,   MKTAG('G','7','2','6') },
     { AV_CODEC_ID_PCM_S16BE,    MKTAG('t','w','o','s') },
     { AV_CODEC_ID_PCM_S16LE,    MKTAG('s','o','w','t') },
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 62af3dc..851091e 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -141,6 +141,7 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size,
         case AV_CODEC_ID_MACE3:
             codec->block_align = 2*codec->channels;
             break;
+        case AV_CODEC_ID_ADPCM_G722:
         case AV_CODEC_ID_MACE6:
             codec->block_align = 1*codec->channels;
             break;