aiff: Support demuxing G.722 streams

diff --git a/libavformat/aiff.h b/libavformat/aiff.h
index f88f957e71abd7ab72e549d11a1d167fcfb6d3b0..4ed135b765f1f2d4a05b25a35aabc2f3395d27be 100644 (file)
--- a/libavformat/aiff.h
+++ b/libavformat/aiff.h
@@ -42,6 +42,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 04cca5d451624fb5aab9ee3fa3058db4c47e36f6..fc0b7ebf81a7b9fb00cffd4264e2f85a974167df 100644 (file)
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -136,6 +136,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;