diff options
| author | Paul B Mahol <onemda@gmail.com> | 2015-10-27 13:24:15 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2015-10-27 13:41:54 +0100 |
| commit | a66243a2014c4ce689b5514f82effeecf6fc20eb (patch) | |
| tree | 2a2330b2a3716f82bd5662f16880c564531ded15 | |
| parent | b95b8e5a2269f8fe6c137a5994b7d273545993d9 (diff) | |
| download | ffmpeg-a66243a2014c4ce689b5514f82effeecf6fc20eb.tar.gz | |
avformat/aiff: add ADP4 DVI ADPCM support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavformat/aiff.h | 1 | ||||
| -rw-r--r-- | libavformat/aiffdec.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/aiff.h b/libavformat/aiff.h index 392f326be9..2a87d6e832 100644 --- a/libavformat/aiff.h +++ b/libavformat/aiff.h @@ -53,6 +53,7 @@ static const AVCodecTag ff_codec_aiff_tags[] = { { AV_CODEC_ID_QDM2, MKTAG('Q','D','M','2') }, { AV_CODEC_ID_QCELP, MKTAG('Q','c','l','p') }, { AV_CODEC_ID_SDX2_DPCM, MKTAG('S','D','X','2') }, + { AV_CODEC_ID_ADPCM_IMA_WS, MKTAG('A','D','P','4') }, { AV_CODEC_ID_NONE, 0 }, }; diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 17c0011f99..34b266d31e 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -157,6 +157,7 @@ static int get_aiff_header(AVFormatContext *s, int size, break; case AV_CODEC_ID_ADPCM_G726LE: codec->bits_per_coded_sample = 5; + case AV_CODEC_ID_ADPCM_IMA_WS: case AV_CODEC_ID_ADPCM_G722: case AV_CODEC_ID_MACE6: case AV_CODEC_ID_SDX2_DPCM: |