aiff: Support demuxing G.722 streams
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Fri, 6 Nov 2015 23:35:51 +0000 (00:35 +0100)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Thu, 12 Nov 2015 03:39:14 +0000 (04:39 +0100)
libavformat/aiff.h
libavformat/aiffdec.c

index f88f957..4ed135b 100644 (file)
@@ -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') },
index 04cca5d..fc0b7eb 100644 (file)
@@ -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;