ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Sat Nov 7 00:35:51 2015 +0100| [73b03249133d6631520089798087cbd963eed9ca] | committer: Vittorio Giovara
aiff: Support demuxing G.722 streams > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73b03249133d6631520089798087cbd963eed9ca --- libavformat/aiff.h | 1 + libavformat/aiffdec.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavformat/aiff.h b/libavformat/aiff.h index f88f957..4ed135b 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 04cca5d..fc0b7eb 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
