Support decoding G.722 in aiff.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Sat, 8 Jun 2013 23:10:36 +0000 (01:10 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Sat, 8 Jun 2013 23:10:36 +0000 (01:10 +0200)
libavformat/aiff.h
libavformat/aiffdec.c

index b3ef577..c13bcc0 100644 (file)
@@ -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') },
index 62af3dc..851091e 100644 (file)
@@ -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;