← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavformat/aiffdec.c

  • Committer: Henrik Rydgård
  • Date: 2014-01-03 10:44:32 UTC
  • Revision ID: git-v1:87c6c126784b1718bfa448ecf2e6a9fef781eb4e
Update our ffmpeg snapshot to a clone of the official repository.

This is because Maxim's at3plus support has been officially merged!

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/aiffdec.c
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;
276
278
        case MKTAG('w', 'a', 'v', 'e'):
277
279
            if ((uint64_t)size > (1<<30))
278
280
                return -1;
279
 
            if (ff_alloc_extradata(st->codec, size))
 
281
            if (ff_get_extradata(st->codec, pb, size) < 0)
280
282
                return AVERROR(ENOMEM);
281
 
            avio_read(pb, st->codec->extradata, size);
282
283
            if (st->codec->codec_id == AV_CODEC_ID_QDM2 && size>=12*4 && !st->codec->block_align) {
283
284
                st->codec->block_align = AV_RB32(st->codec->extradata+11*4);
284
285
                aiff->block_duration = AV_RB32(st->codec->extradata+9*4);