Browse Source

Fix decoding of G.726 in AIFF.

Fixes ticket #1973.
tags/n2.1
Carl Eugen Hoyos 12 years ago
parent
commit
9860fb445a
2 changed files with 3 additions and 1 deletions
  1. +1
    -1
      libavformat/aiff.h
  2. +2
    -0
      libavformat/aiffdec.c

+ 1
- 1
libavformat/aiff.h View File

@@ -46,7 +46,7 @@ static const AVCodecTag ff_codec_aiff_tags[] = {
{ AV_CODEC_ID_MACE6, MKTAG('M','A','C','6') }, { AV_CODEC_ID_MACE6, MKTAG('M','A','C','6') },
{ AV_CODEC_ID_GSM, MKTAG('G','S','M',' ') }, { AV_CODEC_ID_GSM, MKTAG('G','S','M',' ') },
{ AV_CODEC_ID_ADPCM_G722, MKTAG('G','7','2','2') }, { 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_S16BE, MKTAG('t','w','o','s') },
{ AV_CODEC_ID_PCM_S16LE, MKTAG('s','o','w','t') }, { AV_CODEC_ID_PCM_S16LE, MKTAG('s','o','w','t') },
{ AV_CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') }, { AV_CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') },


+ 2
- 0
libavformat/aiffdec.c View File

@@ -141,6 +141,8 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size,
case AV_CODEC_ID_MACE3: case AV_CODEC_ID_MACE3:
codec->block_align = 2*codec->channels; codec->block_align = 2*codec->channels;
break; break;
case AV_CODEC_ID_ADPCM_G726LE:
codec->bits_per_coded_sample = 5;
case AV_CODEC_ID_ADPCM_G722: case AV_CODEC_ID_ADPCM_G722:
case AV_CODEC_ID_MACE6: case AV_CODEC_ID_MACE6:
codec->block_align = 1*codec->channels; codec->block_align = 1*codec->channels;


Loading…
Cancel
Save