← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavformat/cafdec.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/cafdec.c
154
154
            avio_skip(pb, size - ALAC_NEW_KUKI);
155
155
        }
156
156
    } else {
157
 
        if (ff_alloc_extradata(st->codec, size))
 
157
        if (ff_get_extradata(st->codec, pb, size) < 0)
158
158
            return AVERROR(ENOMEM);
159
 
        avio_read(pb, st->codec->extradata, size);
160
159
    }
161
160
 
162
161
    return 0;