From 73b03249133d6631520089798087cbd963eed9ca Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 7 Nov 2015 00:35:51 +0100 Subject: aiff: Support demuxing G.722 streams --- libavformat/aiff.h | 1 + libavformat/aiffdec.c | 1 + 2 files changed, 2 insertions(+) (limited to 'libavformat') diff --git a/libavformat/aiff.h b/libavformat/aiff.h index f88f957e71..4ed135b765 100644 --- 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 04cca5d451..fc0b7ebf81 100644 --- 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; -- cgit v1.2.3