[FFmpeg-cvslog] avformat/aiff: add ADP4 DVI ADPCM support

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Oct 27 13:24:15 2015 +0100| [a66243a2014c4ce689b5514f82effeecf6fc20eb] | committer: Paul B Mahol

avformat/aiff: add ADP4 DVI ADPCM support

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a66243a2014c4ce689b5514f82effeecf6fc20eb
---

 libavformat/aiff.h    |    1 +
 libavformat/aiffdec.c |    1 +
 2 files changed, 2 insertions(+)

diff --git a/libavformat/aiff.h b/libavformat/aiff.h
index 392f326..2a87d6e 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 17c0011..34b266d 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: