[FFmpeg-cvslog] Fix decoding of G.726 in AIFF.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Oct 18 19:53:47 2013 +0200| [9860fb445a90fdfbeaa6e66e813eae3031236ad0] | committer: Carl Eugen Hoyos

Fix decoding of G.726 in AIFF.

Fixes ticket #1973.

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

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

diff --git a/libavformat/aiff.h b/libavformat/aiff.h
index c13bcc0..4470254 100644
--- a/libavformat/aiff.h
+++ b/libavformat/aiff.h
@@ -46,7 +46,7 @@ static const AVCodecTag ff_codec_aiff_tags[] = {
     { 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_ADPCM_G726LE, 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') },
     { AV_CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') },
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 2883713..6f82d93 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -141,6 +141,8 @@ 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_G726LE:
+            codec->bits_per_coded_sample = 5;
         case AV_CODEC_ID_ADPCM_G722:
         case AV_CODEC_ID_MACE6:
             codec->block_align = 1*codec->channels;