Browse code

Fix decoding of G.726 in AIFF.

Fixes ticket #1973.

Carl Eugen Hoyos authored on 2013/10/19 02:53:47
Showing 2 changed files
... ...
@@ -46,7 +46,7 @@ static const AVCodecTag ff_codec_aiff_tags[] = {
46 46
     { AV_CODEC_ID_MACE6,        MKTAG('M','A','C','6') },
47 47
     { AV_CODEC_ID_GSM,          MKTAG('G','S','M',' ') },
48 48
     { AV_CODEC_ID_ADPCM_G722,   MKTAG('G','7','2','2') },
49
-    { AV_CODEC_ID_ADPCM_G726,   MKTAG('G','7','2','6') },
49
+    { AV_CODEC_ID_ADPCM_G726LE, MKTAG('G','7','2','6') },
50 50
     { AV_CODEC_ID_PCM_S16BE,    MKTAG('t','w','o','s') },
51 51
     { AV_CODEC_ID_PCM_S16LE,    MKTAG('s','o','w','t') },
52 52
     { AV_CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') },
... ...
@@ -141,6 +141,8 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size,
141 141
         case AV_CODEC_ID_MACE3:
142 142
             codec->block_align = 2*codec->channels;
143 143
             break;
144
+        case AV_CODEC_ID_ADPCM_G726LE:
145
+            codec->bits_per_coded_sample = 5;
144 146
         case AV_CODEC_ID_ADPCM_G722:
145 147
         case AV_CODEC_ID_MACE6:
146 148
             codec->block_align = 1*codec->channels;